[llvm-branch-commits] [llvm-branch] r80378 - in /llvm/branches/Apple/Leela: runtime/Makefile utils/buildit/build_llvm

[Bob Wilson]

Author: bwilson
Date: Fri Aug 28 12:09:27 2009
New Revision: 80378

URL: http://llvm.org/viewvc/llvm-project?rev=80378&view=rev
Log:
$ svn merge -c 80303 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r80303 into '.':
U    runtime/Makefile
U    utils/buildit/build_llvm
$ svn merge -c 80316 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r80316 into '.':
G    utils/buildit/build_llvm
$ svn merge -c 80319 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r80319 into '.':
G    utils/buildit/build_llvm
$ svn merge -c 80330 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r80330 into '.':
G    runtime/Makefile
$ svn merge -c 80331 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r80331 into '.':
G    runtime/Makefile

Modified:
    llvm/branches/Apple/Leela/runtime/Makefile
    llvm/branches/Apple/Leela/utils/buildit/build_llvm

Modified: llvm/branches/Apple/Leela/runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/runtime/Makefile?rev=80378&r1=80377&r2=80378&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/runtime/Makefile (original)
+++ llvm/branches/Apple/Leela/runtime/Makefile Fri Aug 28 12:09:27 2009
@@ -10,6 +10,8 @@
 LEVEL = ..
 include $(LEVEL)/Makefile.config
 
+ifndef NO_RUNTIME_LIBS
+
 PARALLEL_DIRS  := libprofile
 
 # Disable libprofile: a faulty libtool is generated by autoconf which breaks the
@@ -18,7 +20,8 @@
 PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS))
 endif
 
+endif
+
 include $(LEVEL)/Makefile.common
 
 install::
-

Modified: llvm/branches/Apple/Leela/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/utils/buildit/build_llvm?rev=80378&r1=80377&r2=80378&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Leela/utils/buildit/build_llvm Fri Aug 28 12:09:27 2009
@@ -56,11 +56,8 @@
 DARWIN_VERS=`uname -r | sed 's/\..*//'`
 echo DARWIN_VERS = $DARWIN_VERS
 
-# If we can find an LLVM-GCC, prefer it.
-export CC=/Developer/usr/bin/llvm-gcc
-if [ ! -x $CC ] ; then unset CC ; fi
-export CXX=/Developer/usr/bin/llvm-g++
-if [ ! -x $CXX ] ; then unset CXX ; fi
+# If the user has CC set in their environment unset it now
+unset CC
 
 if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then
     DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/Developer/usr
@@ -98,6 +95,7 @@
         --enable-targets=arm,x86,powerpc,cbe \
         --enable-assertions=$LLVM_ASSERTIONS \
         --enable-optimized=$LLVM_OPTIMIZED \
+        --disable-bindings \
         || exit 1
 fi
 
@@ -148,6 +146,7 @@
 fi
 
 make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
+    NO_RUNTIME_LIBS=1 \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
     CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \
@@ -171,6 +170,7 @@
 
 # Install the tree into the destination directory.
 make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
+    NO_RUNTIME_LIBS=1 \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
     OPTIMIZE_OPTION='-O3' VERBOSE=1 install