diff options
| author | Bill Wendling <isanbard@gmail.com> | 2008-10-27 23:31:24 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2008-10-27 23:31:24 +0000 |
| commit | e2e6a117fe17afafda59c485c55d4f85ca8d6353 (patch) | |
| tree | 51ed30acaed37f8cc6a867822759872c2414f4b2 /utils/buildit | |
| parent | dffc5553bb77d000aeec616ed7506f152d83875f (diff) | |
| download | external_llvm-e2e6a117fe17afafda59c485c55d4f85ca8d6353.zip external_llvm-e2e6a117fe17afafda59c485c55d4f85ca8d6353.tar.gz external_llvm-e2e6a117fe17afafda59c485c55d4f85ca8d6353.tar.bz2 | |
- Fix SUBVERSION string to handle x.x.x version number formats.
- Add VERBOSE=1 flag.
- Specify the LLVM_SUBMIT_VERSION when doing the "make install".
The libLTO.dylib relies upon this flag during that time.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58298 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/buildit')
| -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 6b83477..09baca0 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!" |