Author: void
Date: Thu Aug 2 16:13:45 2007
New Revision: 40755
URL: http://llvm.org/viewvc/llvm-project?rev=40755&view=rev
Log:
Hack to force MacOS X to use the system libgcc_s instead of
the one built by LLVM during bootstrapping.
Modified:
llvm-gcc-4.0/trunk/build_gcc
llvm-gcc-4.0/trunk/gcc/Makefile.in
Modified: llvm-gcc-4.0/trunk/build_gcc
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/build_gcc?rev=40755&r1=40754&r2=40755&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/build_gcc (original)
+++ llvm-gcc-4.0/trunk/build_gcc Thu Aug 2 16:13:45 2007
@@ -424,35 +424,6 @@
.$DEST_ROOT/lib/gcc || exit 1
done
-SHARED_LIBS="libgcc_s.1.dylib libgcc_s.10.4.dylib libgcc_s.10.5.dylib"
-if echo $HOSTS | grep -q powerpc ; then
- SHARED_LIBS="${SHARED_LIBS} libgcc_s_ppc64.1.dylib"
-fi
-# APPLE LOCAL begin x86_64 support */
-if echo $HOSTS | grep -q i686 ; then
- SHARED_LIBS="${SHARED_LIBS} libgcc_s_x86_64.1.dylib"
-fi
-# APPLE LOCAL end x86_64 support */
-for l in $SHARED_LIBS ; do
- CANDIDATES=()
- for t in $TARGETS ; do
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
- if [ -e $DIR/dst-$t-$t/$DEST_ROOT/lib/$l ] ; then
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
- CANDIDATES[${#CANDIDATES[*]}]=$DIR/dst-$t-$t/$DEST_ROOT/lib/$l
- fi
- done
-# APPLE LOCAL LLVM CANDIDATES can be empty!
- if [ "[EMAIL PROTECTED]" != x ]; then
- if [ -L ${CANDIDATES[0]} ] ; then
- ln -s `readlink ${CANDIDATES[0]}` .$DEST_ROOT/lib/$l || exit 1
- else
- lipo -output .$DEST_ROOT/lib/$l -create "[EMAIL PROTECTED]" || exit 1
- fi
-# APPLE LOCAL LLVM CANDIDATES can be empty!
- fi
-done
-
for t in $TARGETS ; do
cp -p /usr/lib/libstdc++.6.dylib \
.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \
Modified: llvm-gcc-4.0/trunk/gcc/Makefile.in
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/Makefile.in?rev=40755&r1=40754&r2=40755&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.0/trunk/gcc/Makefile.in Thu Aug 2 16:13:45 2007
@@ -4079,7 +4079,7 @@
# The stage1 compiler is always built with checking enabled.
stage1_build:
if test "${SET_DYLIB_PATH}" = "1"; then \
- DYLD_LIBRARY_PATH="`${PWD_COMMAND}`"; \
+ DYLD_LIBRARY_PATH="/usr/lib:`${PWD_COMMAND}`"; \
fi; \
$(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" \
CFLAGS="$(STAGE1_CFLAGS) $(STAGE1_CHECKING)" \
@@ -4095,11 +4095,15 @@
echo stage2_build > stage_last
stage2_build: stage1_copy
- $(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/
-B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext)
-Bstage1/ -B$(build_tooldir)/bin/" \
- STAGE_PREFIX=stage1/ \
- $(POSTSTAGE1_FLAGS_TO_PASS) \
- $(STAGE2_FLAGS_TO_PASS) \
- LLVM_STAGE="-stage2"
+ if test "${SET_DYLIB_PATH}" = "1"; then \
+ DYLD_LIBRARY_PATH="/usr/lib:`${PWD_COMMAND}`"; \
+ fi; \
+ $(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/
-B$(build_tooldir)/bin/" \
+ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext)
-Bstage1/ -B$(build_tooldir)/bin/" \
+ STAGE_PREFIX=stage1/ \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(STAGE2_FLAGS_TO_PASS) \
+ LLVM_STAGE="-stage2"
$(STAMP) stage2_build
echo stage2_build > stage_last
@@ -4109,11 +4113,15 @@
echo stage3_build > stage_last
stageprofile_build: stage1_copy
- $(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/
-B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext)
-Bstage1/ -B$(build_tooldir)/bin/" \
- STAGE_PREFIX=stage1/ \
- $(POSTSTAGE1_FLAGS_TO_PASS) \
- $(STAGEPROFILE_FLAGS_TO_PASS) \
- LLVM_STAGE="-stage_profile"
+ if test "${SET_DYLIB_PATH}" = "1"; then \
+ DYLD_LIBRARY_PATH="/usr/lib:`${PWD_COMMAND}`"; \
+ fi; \
+ $(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/
-B$(build_tooldir)/bin/" \
+ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext)
-Bstage1/ -B$(build_tooldir)/bin/" \
+ STAGE_PREFIX=stage1/ \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(STAGEPROFILE_FLAGS_TO_PASS) \
+ LLVM_STAGE="-stage_profile"
$(STAMP) stageprofile_build
echo stageprofile_build > stage_last
@@ -4123,20 +4131,28 @@
echo stagefeedback_build > stage_last
stage3_build: stage2_copy
- $(MAKE) CC="$(STAGE_CC_WRAPPER) stage2/xgcc$(exeext) -Bstage2/
-B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage2/xgcc$(exeext)
-Bstage2/ -B$(build_tooldir)/bin/" \
- STAGE_PREFIX=stage2/ \
- $(POSTSTAGE1_FLAGS_TO_PASS) \
- $(STAGE2_FLAGS_TO_PASS) \
- LLVM_STAGE=""
+ if test "${SET_DYLIB_PATH}" = "1"; then \
+ DYLD_LIBRARY_PATH="/usr/lib:`${PWD_COMMAND}`"; \
+ fi; \
+ $(MAKE) CC="$(STAGE_CC_WRAPPER) stage2/xgcc$(exeext) -Bstage2/
-B$(build_tooldir)/bin/" \
+ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage2/xgcc$(exeext)
-Bstage2/ -B$(build_tooldir)/bin/" \
+ STAGE_PREFIX=stage2/ \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(STAGE2_FLAGS_TO_PASS) \
+ LLVM_STAGE=""
$(STAMP) stage3_build
echo stage3_build > stage_last
stagefeedback_build: stageprofile_copy stage1_copy
- $(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/
-B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext)
-Bstage1/ -B$(build_tooldir)/bin/" \
- STAGE_PREFIX=stage1/ \
- $(POSTSTAGE1_FLAGS_TO_PASS) \
- $(STAGEFEEDBACK_FLAGS_TO_PASS) \
- LLVM_STAGE="-stage_feedback"
+ if test "${SET_DYLIB_PATH}" = "1"; then \
+ DYLD_LIBRARY_PATH="/usr/lib:`${PWD_COMMAND}`"; \
+ fi; \
+ $(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/
-B$(build_tooldir)/bin/" \
+ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext)
-Bstage1/ -B$(build_tooldir)/bin/" \
+ STAGE_PREFIX=stage1/ \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(STAGEFEEDBACK_FLAGS_TO_PASS) \
+ LLVM_STAGE="-stage_feedback"
$(STAMP) stagefeedback_build
echo stagefeedback_build > stage_last
@@ -4152,10 +4168,14 @@
echo stage4_build > stage_last
stage4_build: stage3_copy
- $(MAKE) CC="$(STAGE_CC_WRAPPER) stage3/xgcc$(exeext) -Bstage3/
-B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage3/xgcc$(exeext)
-Bstage3/ -B$(build_tooldir)/bin/" \
- STAGE_PREFIX=stage3/ \
- $(POSTSTAGE1_FLAGS_TO_PASS) \
- $(STAGE2_FLAGS_TO_PASS)
+ if test "${SET_DYLIB_PATH}" = "1"; then \
+ DYLD_LIBRARY_PATH="/usr/lib:`${PWD_COMMAND}`"; \
+ fi; \
+ $(MAKE) CC="$(STAGE_CC_WRAPPER) stage3/xgcc$(exeext) -Bstage3/
-B$(build_tooldir)/bin/" \
+ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage3/xgcc$(exeext)
-Bstage3/ -B$(build_tooldir)/bin/" \
+ STAGE_PREFIX=stage3/ \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(STAGE2_FLAGS_TO_PASS)
$(STAMP) stage4_build
echo stage4_build > stage_last
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
