--- a/components/gcc3/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gcc3/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,8 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
+
+COMPILER =	gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gcc
@@ -35,18 +38,15 @@
 
 TPNO=			17028
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PARCH =		$(MACH:i386=i386-pc)
 GNU_ARCH =	$(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION)
 
 PKG_MACROS +=	GNU_ARCH="$(GNU_ARCH)"
 
-# we build gcc with gcc
-COMPILER =	gcc
-
 # CC_BITS may get in the way
 CC_BITS=
 
@@ -90,8 +90,13 @@
 
 install:	$(PROTO_DIR)/.sedded
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 test: $(TEST_32)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += developer/assembler
+REQUIRED_PACKAGES += developer/gnu-binutils
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc-3-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker