[llvm-commits] [llvm] r58293 - in /llvm/tags/Apple/llvmCore-2077.3: ./ utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Mon Oct 27 18:19:33 2008
New Revision: 58293

URL: http://llvm.org/viewvc/llvm-project?rev=58293&view=rev
Log:
Pass in the LLVM_SUBMIT_VERSION flags when doing a 'make install'. The libLTO install process uses this flag.

Added:
    llvm/tags/Apple/llvmCore-2077.3/
      - copied from r58209, llvm/tags/Apple/llvmCore-2077.2/
Modified:
    llvm/tags/Apple/llvmCore-2077.3/utils/buildit/build_llvm

Modified: llvm/tags/Apple/llvmCore-2077.3/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2077.3/utils/buildit/build_llvm?rev=58293&r1=58209&r2=58293&view=diff

==============================================================================
--- llvm/tags/Apple/llvmCore-2077.3/utils/buildit/build_llvm (original)
+++ llvm/tags/Apple/llvmCore-2077.3/utils/buildit/build_llvm Mon Oct 27 18:19:33 2008
@@ -89,7 +89,7 @@
         || exit 1
 fi
 
-SUBVERSION=`echo $RC_ProjectSourceVersion | sed -e 's/.*\.//'`
+SUBVERSION=`echo $RC_ProjectSourceVersion | sed -e 's/[^.]*\.\([0-9]*\).*/\1/'`
 
 if [ "x$SUBVERSION" != "x$RC_ProjectSourceVersion" ]; then
     LLVM_SUBMIT_SUBVERSION=`printf "%02d" $SUBVERSION`
@@ -138,7 +138,8 @@
 make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
-    CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'"
+    CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \
+    VERBOSE=1
 
 if ! test $? == 0 ; then
     echo "error: LLVM 'make' failed!"
@@ -158,7 +159,10 @@
 
 # Install the tree into the destination directory.
 make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
-    OPTIMIZE_OPTION='-O2' install
+    OPTIMIZE_OPTION='-O2' \
+    LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
+    LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
+    VERBOSE=1 install
 
 if ! test $? == 0 ; then
     echo "error: LLVM 'make install' failed!"