[llvm-commits] [llvm] r53478 - in /llvm/tags/Apple/llvmCore-2045.2: ./ utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Fri Jul 11 17:33:27 2008
New Revision: 53478

URL: http://llvm.org/viewvc/llvm-project?rev=53478&view=rev
Log:
Update to build_llvm. Don't output a floating point number for the version.

Added:
    llvm/tags/Apple/llvmCore-2045.2/
      - copied from r53477, llvm/tags/Apple/llvmCore-2045/
Modified:
    llvm/tags/Apple/llvmCore-2045.2/utils/buildit/build_llvm

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

==============================================================================
--- llvm/tags/Apple/llvmCore-2045.2/utils/buildit/build_llvm (original)
+++ llvm/tags/Apple/llvmCore-2045.2/utils/buildit/build_llvm Fri Jul 11 17:33:27 2008
@@ -89,6 +89,14 @@
         || exit 1
 fi
 
+SUBVERSION=`echo $RC_ProjectSourceVersion | sed -e 's/.*\.//'`
+
+if [ "x$SUBVERSION" != "x$RC_ProjectSourceVersion" ]; then
+    LLVM_SUBMIT_SUBVERSION=`printf "%02d" $SUBVERSION`
+    RC_ProjectSourceVersion=`echo $RC_ProjectSourceVersion | sed -e 's/\..*//'`
+    LLVM_SUBMIT_VERSION=$RC_ProjectSourceVersion
+fi
+
 if [ "x$LLVM_SUBMIT_SUBVERSION" = "x00" -o "x$LLVM_SUBMIT_SUBVERSION" = "x0" ]; then
     LLVM_VERSION="$LLVM_SUBMIT_VERSION"
 else
@@ -158,6 +166,7 @@
 
 # Install Version.h
 RC_ProjectSourceSubversion=`printf "%d" $LLVM_SUBMIT_SUBVERSION`
+
 echo "#define LLVM_VERSION ${RC_ProjectSourceVersion}" > $DEST_DIR$DEST_ROOT/include/llvm/Version.h
 echo "#define LLVM_MINOR_VERSION ${RC_ProjectSourceSubversion}" >> $DEST_DIR$DEST_ROOT/include/llvm/Version.h
 
@@ -176,8 +185,10 @@
 
 if [ $MACOSX_DEPLOYMENT_TARGET = "10.4" ]; then
     find . -perm 755 -type f -exec lipo -extract ppc -extract i386 {} -output {} \;
-else
+elif [ $MACOSX_DEPLOYMENT_TARGET = "10.5" ]; then
     find . -perm 755 -type f -exec lipo -extract ppc7400 -extract i386 {} -output {} \;
+else
+    find . -perm 755 -type f -exec lipo -extract ppc7400 -extract i386 -extract x86_64 {} -output {} \;
 fi
 
 cd $DEST_DIR$DEST_ROOT