[llvm-branch-commits] [llvm-tag] r109533 - in /llvm/tags/Apple/llvmCore-2326.12: ./ utils/buildit/GNUmakefile utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Tue Jul 27 14:48:48 2010
New Revision: 109533

URL: http://llvm.org/viewvc/llvm-project?rev=109533&view=rev
Log:
Create a copy of 2326.10 which doesn't install libLTO.dylib by default.

Added:
    llvm/tags/Apple/llvmCore-2326.12/   (props changed)
      - copied from r109530, llvm/tags/Apple/llvmCore-2326.10/
Modified:
    llvm/tags/Apple/llvmCore-2326.12/utils/buildit/GNUmakefile
    llvm/tags/Apple/llvmCore-2326.12/utils/buildit/build_llvm

Propchange: llvm/tags/Apple/llvmCore-2326.12/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 27 14:48:48 2010
@@ -0,0 +1,22 @@
+Debug
+Release
+Release-Asserts
+mklib
+Makefile.config
+config.log
+config.status
+cvs.out
+autom4te.cache
+configure.out
+LLVM-*
+_distcheckdir
+llvm.spec
+svn-commit.*
+*.patch
+*.patch.raw
+cscope.*
+Debug+Coverage-Asserts
+Release+Coverage-Asserts
+Debug+Coverage
+Release+Coverage
+Debug+Checks

Propchange: llvm/tags/Apple/llvmCore-2326.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 27 14:48:48 2010
@@ -0,0 +1,3 @@
+/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
+/llvm/branches/Apple/Morbo:100162
+/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,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99537,99539,99544,99570,99575,99629-99630,99671,99692,99695,99697,99699,99722,99846,99850,99910,100149,100170,100186,101453,101686

Modified: llvm/tags/Apple/llvmCore-2326.12/utils/buildit/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.12/utils/buildit/GNUmakefile?rev=109533&r1=109530&r2=109533&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.12/utils/buildit/GNUmakefile (original)
+++ llvm/tags/Apple/llvmCore-2326.12/utils/buildit/GNUmakefile Tue Jul 27 14:48:48 2010
@@ -46,6 +46,9 @@
 LLVM_OPTIMIZED := yes
 endif
 
+# Default to not install libLTO.dylib.
+INSTALL_LIBLTO := no
+
 ifndef RC_ProjectSourceVersion
 RC_ProjectSourceVersion = 9999
 endif
@@ -59,7 +62,7 @@
 	cd $(OBJROOT) && \
 	  $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
-	    $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) \
+	    $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) $(INSTALL_LIBLTO) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
 
 

Modified: llvm/tags/Apple/llvmCore-2326.12/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.12/utils/buildit/build_llvm?rev=109533&r1=109530&r2=109533&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.12/utils/buildit/build_llvm (original)
+++ llvm/tags/Apple/llvmCore-2326.12/utils/buildit/build_llvm Tue Jul 27 14:48:48 2010
@@ -42,11 +42,15 @@
 # build.
 LLVM_OPTIMIZED="$8"
 
+# The ninth parameter is a yes/no that indicates whether libLTO.dylib
+# should be installed.
+INSTALL_LIBLTO="$9"
+
 # The nineth parameter is the version number of the submission, e.g. 1007.
-LLVM_SUBMIT_VERSION="$9"
+LLVM_SUBMIT_VERSION="${10}"
 
 # The tenth parameter is the subversion number of the submission, e.g. 03.
-LLVM_SUBMIT_SUBVERSION="${10}"
+LLVM_SUBMIT_SUBVERSION="${11}"
 
 # The current working directory is where the build will happen. It may already
 # contain a partial result of an interrupted build, in which case this script
@@ -277,9 +281,15 @@
 fi
 
 cd $DEST_DIR$DEST_ROOT
-mkdir -p $DT_HOME/lib
-mv lib/libLTO.dylib $DT_HOME/lib/libLTO.dylib
-strip -S $DT_HOME/lib/libLTO.dylib
+if [ "$INSTALL_LIBLTO" = "yes" ]; then
+    mkdir -p $DT_HOME/lib
+    mv lib/libLTO.dylib $DT_HOME/lib/libLTO.dylib
+
+    # Use '-l' to strip i386 modules. N.B. that flag doesn't work with kext or
+    # PPC objects!
+    strip -arch all -Sl $DT_HOME/lib/libLTO.dylib
+fi
+
 rm -f lib/libLTO.a lib/libLTO.la
 
 # The Hello dylib is an example of how to build a pass. No need to install it.
@@ -344,10 +354,11 @@
 ################################################################################
 # symlinks so that B&I can find things
 
-cd $DEST_DIR
-mkdir -p ./usr/lib/
-cd usr/lib
-ln -s ../../$DEVELOPER_DIR/usr/lib/libLTO.dylib ./libLTO.dylib
+if [ "$INSTALL_LIBLTO" = "yes" ]; then
+  mkdir -p $DEST_DIR/usr/lib/
+  cd $DEST_DIR/usr/lib && \
+    ln -s ../../$DEVELOPER_DIR/usr/lib/libLTO.dylib ./libLTO.dylib
+fi
 
 ################################################################################
 # w00t! Done!