# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1313781001 25200
# Node ID 9b12cda204fe751eb26de8a1f850e8921ea9d1df
# Parent  63ed89d661a39b99e8ed15b2ae657074c96592d6
7080213 gcc-3 should not deliver /usr/gnu/bin/cc and its man page.

diff -r 63ed89d661a3 -r 9b12cda204fe components/bcc/Makefile
--- a/components/bcc/Makefile	Fri Aug 19 08:33:43 2011 -0700
+++ b/components/bcc/Makefile	Fri Aug 19 12:10:01 2011 -0700
@@ -41,7 +41,7 @@
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
 # Create the Makefile before we build
-COMPONENT_PRE_BUILD_ACTION = (cd $(@D) ; $(GMAKE) make.fil)
+COMPONENT_PRE_BUILD_ACTION = (cd $(@D) ; CC="$(CC)" $(GMAKE) make.fil)
 # build with the created Makefile (make.fil)
 COMPONENT_BUILD_ARGS = -f make.fil
 COMPONENT_BUILD_ARGS += PATH="$(@D)/bin:$(PATH)"
diff -r 63ed89d661a3 -r 9b12cda204fe components/gcc3/gcc-3.p5m
--- a/components/gcc3/gcc-3.p5m	Fri Aug 19 08:33:43 2011 -0700
+++ b/components/gcc3/gcc-3.p5m	Fri Aug 19 12:10:01 2011 -0700
@@ -463,10 +463,7 @@
 link path=usr/bin/gccbug target=../sfw/bin/gccbug
 link path=usr/bin/gcov target=../sfw/bin/gcov
 link path=usr/bin/gcpp target=../sfw/bin/cpp
-link path=usr/gnu/bin/cc target=../../sfw/bin/gcc
 link path=usr/gnu/bin/cpp target=../../sfw/bin/cpp
-link path=usr/gnu/share/man/man1/cc.1 \
-    target=../../../../sfw/share/man/man1/gcc.1
 link path=usr/gnu/share/man/man1/cpp.1 \
     target=../../../../sfw/share/man/man1/cpp.1
 link path=usr/sfw/libexec/gcc/$(GNU_ARCH)/3.4.3/as \
diff -r 63ed89d661a3 -r 9b12cda204fe components/imagemagick/Makefile
--- a/components/imagemagick/Makefile	Fri Aug 19 08:33:43 2011 -0700
+++ b/components/imagemagick/Makefile	Fri Aug 19 12:10:01 2011 -0700
@@ -61,6 +61,11 @@
 #
 CFLAGS+= -errtags
 
+# Needed to generate a decent RUNPATH for Magick.so
+#
+COMPONENT_BUILD_ARGS += LD="$(CC)"
+COMPONENT_BUILD_ARGS += LD_RUN_PATH="$(CONFIGURE_LIBDIR.$(BITS))"
+
 CONFIGURE_OPTIONS+= CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS+= CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_OPTIONS+= --with-modules
diff -r 63ed89d661a3 -r 9b12cda204fe components/nethack/Makefile
--- a/components/nethack/Makefile	Fri Aug 19 08:33:43 2011 -0700
+++ b/components/nethack/Makefile	Fri Aug 19 12:10:01 2011 -0700
@@ -25,6 +25,8 @@
 
 include ../../make-rules/shared-macros.mk
 
+PATH=$(dir $(CC)):/usr/bin:/usr/gnu/bin
+
 COMPONENT_NAME=		nethack
 COMPONENT_VERSION=	3.4.3
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
diff -r 63ed89d661a3 -r 9b12cda204fe components/perl512/Makefile
--- a/components/perl512/Makefile	Fri Aug 19 08:33:43 2011 -0700
+++ b/components/perl512/Makefile	Fri Aug 19 12:10:01 2011 -0700
@@ -22,6 +22,8 @@
 #
 include ../../make-rules/shared-macros.mk
 
+PATH=$(dir $(CC)):/usr/bin:/usr/gnu/bin
+
 # I want to override PERL_VERSION and PERL_ARCH because when building
 # a new version of perl it probably isn't installed so shared-macros.mk
 # can't call it.