[llvm-commits] [125528] Apply Geoff's patch to fix bootstrap failures.

[dpatel at apple.com]

Revision: 125528
Author:   dpatel
Date:     2007-03-29 15:06:04 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Apply Geoff's patch to fix bootstrap failures.

Modified Paths:
--------------
    apple-local/branches/llvm/ChangeLog.apple
    apple-local/branches/llvm/build_gcc

Modified: apple-local/branches/llvm/ChangeLog.apple
===================================================================
--- apple-local/branches/llvm/ChangeLog.apple	2007-03-29 19:54:52 UTC (rev 125527)
+++ apple-local/branches/llvm/ChangeLog.apple	2007-03-29 22:06:04 UTC (rev 125528)
@@ -1,3 +1,32 @@
+2007-03-15  Geoffrey Keating  <geoffk at apple.com>
+
+	* build_gcc: Unset RC_DEBUG_OPTIONS when bootstrapping.
+
+2006-12-13  Geoffrey Keating  <geoffk at apple.com>
+
+	Radar 4697325
+	* driverdriver.c: New.
+	* build_gcc: Use driverdriver.c rather than
+	gcc/config/darwin-driver.c.
+
+2007-02-27  Geoffrey Keating  <geoffk at apple.com>
+
+	Radar 4913513
+	* build_gcc: Copy contents of dSYM directories, not just
+	directory itself.
+
+2007-02-06  Mike Stump  <mrs at apple.com>
+
+	Radar 4979322
+	* build_gcc: Remove sdk bits.
+	* sdk: Remove.
+	* sdk-test: Remove.
+
+2007-01-26  Mike Stump  <mrs at apple.com>
+
+	Radar 4895582
+	* sdk: Build up liibstdcxx fixups for 10.4 SDKs.
+
 2007-01-05  Geoffrey Keating  <geoffk at apple.com>
 
 	Radar 4913513

Modified: apple-local/branches/llvm/build_gcc
===================================================================
--- apple-local/branches/llvm/build_gcc	2007-03-29 19:54:52 UTC (rev 125527)
+++ apple-local/branches/llvm/build_gcc	2007-03-29 22:06:04 UTC (rev 125528)
@@ -244,7 +244,9 @@
    `if [ $BUILD = i686 ] ; then echo $I386_CPU ; fi` \
    --host=$BUILD-apple-darwin$DARWIN_VERS --target=$BUILD-apple-darwin$DARWIN_VERS || exit 1
 fi
-make $MAKEFLAGS $BOOTSTRAP CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
+# Unset RC_DEBUG_OPTIONS because it causes the bootstrap to fail.
+RC_DEBUG_OPTIONS= \
+  make $MAKEFLAGS $BOOTSTRAP CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
 make $MAKEFLAGS html CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
 make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-$BUILD install-gcc install-target \
   CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1