diff options
| -rwxr-xr-x | utils/buildit/build_llvm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm index 6b83477e2c..09baca09ec 100755 --- a/utils/buildit/build_llvm +++ b/utils/buildit/build_llvm @@ -89,7 +89,7 @@ if [ \! -f Makefile.config ]; then || 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 @@ fi 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,9 @@ cd $DIR/obj-llvm || exit 1 # Install the tree into the destination directory. make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \ - OPTIMIZE_OPTION='-O2' install + LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \ + LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \ + OPTIMIZE_OPTION='-O2' VERBOSE=1 install if ! test $? == 0 ; then echo "error: LLVM 'make install' failed!" |