hasting2 02/11/05 15:59:51
Modified: live/gcc3 build_gcc
Log:
Fixes for TOT bootstrap after recent FSF merge.
Revision Changes Path
1.64 +13 -7 src/live/gcc3/build_gcc
Index: build_gcc
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/build_gcc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- build_gcc 2002/11/02 00:17:49 1.63
+++ build_gcc 2002/11/05 23:59:51 1.64
@@ -73,13 +73,13 @@
ENABLE_LANGUAGES="c++,c,objc,objc++"
COMPILERS="cpp cc1 cc1plus cc1obj cc1objplus"
# Suffix to add to the tools. ("3" for 10.2 installed version)
- SUFFIX=33
+ SUFFIX=3
# Name (and install_name!) of libstdc++.dylib to build (if any.)
LIBSTDCPP_DYLIB=libstdc++.dylib # formerly
libstdc++.${APPLE_CC}.dylib
LIBSTDCPP_DYLIB_VERSION=A
LIBRARIES="libgcc.a libcc_kext.a libgcc_static.a libsupc++.a $LIBSTDCPP_DYLIB
libstdc++.a libcc_noc++.a"
TOOLS="gcc$SUFFIX g++$SUFFIX c++$SUFFIX c++filt$SUFFIX gcov$SUFFIX cpp$SUFFIX"
# c++3 must be after g++3 in the list
- CRTS="crtbegin.o"
+ CRTS="crtbegin.o crtend.o"
# uncomment to speed up testing
#ENABLE_LANGUAGES="c++,c"
@@ -1302,11 +1302,17 @@
"cwd = `pwd`"
$SET -x
- $n gnumake CC=$OBJROOT/cc-$target-on-$arch/xgcc \
- CXX=$OBJROOT/cc-$target-on-$arch/g++ \
- CPPFLAGS="-no-cpp-precomp" \
- CFLAGS="-arch $target -no-cpp-precomp
-B$OBJROOT/cc-$target-on-$arch/ ${OPT_OVERRIDE:--O2} $CFLAGS" \
- CXXFLAGS="-arch $target -B$OBJROOT/cc-$target-on-$arch/
${OPT_OVERRIDE:--O2} $CFLAGS"
+ # can't expand a make-var on cmdline: "gnumake FOO=blort "BAR=double $FOO"
will NOT expand to "BAR=double blort"
+ # 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_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"
+ $n gnumake CC=$OBJROOT/cc-$target-on-$arch/xgcc \
+ CXX="$OBJROOT/cc-$target-on-$arch/g++" \
+ CFLAGS="$MY_CFLAGS" \
+ CXXFLAGS="$MY_CXXFLAGS" \
+ CPPFLAGS="-no-cpp-precomp"
status=$?
$SET +x
check_status $status "*** gnumake failed building libstdc++-v3 ***"
