dpatel 03/02/03 16:15:26
Modified: live/gcc3 build_gcc
Log:
Bug : Fix TOT bootstrap failure when gcc3-1175 is system compiler
Reviewed by: Geoffrey Keating
Revision Changes Path
1.70 +10 -6 src/live/gcc3/build_gcc
Index: build_gcc
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/build_gcc,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- build_gcc 2002/11/15 22:53:43 1.69
+++ build_gcc 2003/02/04 00:15:26 1.70
@@ -204,16 +204,19 @@
$nc build_compiler
#
- # Configure libstdc++-v3...
- #
- $nc configure_libstdcpp
-
- #
# If not cross-build to a different OS then we can use the compiler we just
built
# to build the libraries.
#
if [ ! "$NEXT_ROOT" ]; then
$nc build_libgcc_and_specs
+ fi
+
+ #
+ # Configure libstdc++-v3...
+ #
+ $nc configure_libstdcpp
+
+ if [ ! "$NEXT_ROOT" ]; then
$nc build_libstdcpp
$nc build_libgcc_kext
fi
@@ -1307,8 +1310,9 @@
# it *may* be possible to have gnumake expand these, but such requires complex
escaping conventions
# expand these in my own environment so they are fully expanded before passing
to gnumake
local MY_CXXLIB="$OBJROOT/$target/libstdc++-v3/src/.libs"
+ local MY_CXXLIB_2="$OBJROOT/$target/soft-float/libstdc++-v3/src/.libs"
local MY_CFLAGS="-arch $target -no-cpp-precomp -B$OBJROOT/cc-$target-on-$arch/
${OPT_OVERRIDE:--O2} $CFLAGS"
- local MY_CXXFLAGS="-arch $target -B$OBJROOT/cc-$target-on-$arch/
${OPT_OVERRIDE:--O2} -L$MY_CXXLIB $MY_1_CFLAGS"
+ local MY_CXXFLAGS="-arch $target -B$OBJROOT/cc-$target-on-$arch/
${OPT_OVERRIDE:--O2} -L$MY_CXXLIB -L$MY_CXXLIB_2 $MY_1_CFLAGS"
$n gnumake CC=$OBJROOT/cc-$target-on-$arch/xgcc \
CXX="$OBJROOT/cc-$target-on-$arch/g++" \
CFLAGS="$MY_CFLAGS" \
