[llvm-branch-commits] [llvm-branch] r99337 - in /llvm/branches/Apple/Morbo: ./ tools/Makefile utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Tue Mar 23 17:17:48 2010
New Revision: 99337

URL: http://llvm.org/viewvc/llvm-project?rev=99337&view=rev
Log:
$ svn merge -c 99336 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r99336 into '.':
U    utils/buildit/build_llvm
U    tools/Makefile

Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/tools/Makefile
    llvm/branches/Apple/Morbo/utils/buildit/build_llvm

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 17:17:48 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336

Modified: llvm/branches/Apple/Morbo/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/tools/Makefile?rev=99337&r1=99336&r2=99337&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/tools/Makefile (original)
+++ llvm/branches/Apple/Morbo/tools/Makefile Tue Mar 23 17:17:48 2010
@@ -22,7 +22,6 @@
                  lli llvm-extract \
                  bugpoint llvm-bcanalyzer llvm-stub \
                  llvm-mc llvmc
-                 
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
@@ -38,7 +37,7 @@
   # No support for dynamic libraries on windows targets.
   ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
     PARALLEL_DIRS += edis
-    
+
     # gold only builds if binutils is around.  It requires "lto" to build before
     # it so it is added to DIRS.
     ifdef BINUTILS_INCDIR
@@ -54,4 +53,9 @@
   PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
 endif
 
+# Don't build edis if we explicitly disabled it.
+ifneq ($(DISABLE_EDIS),1)
+  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+endif
+
 include $(LEVEL)/Makefile.common

Modified: llvm/branches/Apple/Morbo/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/utils/buildit/build_llvm?rev=99337&r1=99336&r2=99337&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Morbo/utils/buildit/build_llvm Tue Mar 23 17:17:48 2010
@@ -204,6 +204,7 @@
     UNIVERSAL_SDK_PATH=$HOST_SDKROOT \
     NO_RUNTIME_LIBS=1 \
     REQUIRES_RTTI=1 \
+    DISABLE_EDIS=1 \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
     CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \
@@ -228,6 +229,7 @@
 # Install the tree into the destination directory.
 make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
     NO_RUNTIME_LIBS=1 \
+    DISABLE_EDIS=1 \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
     OPTIMIZE_OPTION='-O3' VERBOSE=1 install