--- a/components/gcc48/Makefile Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gcc48/Makefile Thu Mar 19 20:44:31 2015 -0700
@@ -18,10 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
export PARFAIT_BUILD=no
+COMPILER=gcc
+
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= gcc
@@ -36,11 +38,9 @@
TPNO= 15448
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-
-COMPILER=gcc
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
# The GNU compiler wants the GNU utilities.
PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin
@@ -132,7 +132,14 @@
test: $(TEST_32)
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/mpc
+REQUIRED_PACKAGES += library/mpfr
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker