diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2013-01-12 02:31:42 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2013-01-12 02:31:42 +0000 |
| commit | 6f4ccaf2876459c12356ce2a3678c5ac001cb7c6 (patch) | |
| tree | 49dfe7efbfa4e8ac237bad69e0c6be67285ca4c8 /utils/buildit | |
| parent | 0e385450fc62a69cf7c557173f2f5df132702379 (diff) | |
| download | llvm-6f4ccaf2876459c12356ce2a3678c5ac001cb7c6.tar.gz llvm-6f4ccaf2876459c12356ce2a3678c5ac001cb7c6.tar.bz2 llvm-6f4ccaf2876459c12356ce2a3678c5ac001cb7c6.tar.xz | |
Fix quoting problems from my previous change. <rdar://problem/13001651>
I give up trying to get all of the settings into COMMON_MAKEFLAGS, so just
do the easy thing and repeat the ones with interesting quoting issues
in each make command.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172296 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/buildit')
| -rwxr-xr-x | utils/buildit/build_llvm | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm index 3d9364f5f0..42f8af0ef4 100755 --- a/utils/buildit/build_llvm +++ b/utils/buildit/build_llvm @@ -88,7 +88,6 @@ if [ "x$LLVM_SUBMIT_SUBVERSION" = "x00" -o "x$LLVM_SUBMIT_SUBVERSION" = "x0" ]; else LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION" fi -LLVM_VERSION_INFO="'\" Apple Build #$LLVM_VERSION\"'" # Figure out how many make processes to run. SYSCTL=`sysctl -n hw.activecpu` @@ -106,7 +105,16 @@ COMMON_CONFIGURE_OPTS="\ --enable-optimized=$LLVM_OPTIMIZED \ --disable-bindings" -COMMON_MAKEFLAGS=$JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$HOSTS" UNIVERSAL_SDK_PATH=$SDKROOT NO_RUNTIME_LIBS=1 DISABLE_EDIS=1 REQUIRES_RTTI=1 DEBUG_SYMBOLS=1 LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION CXXFLAGS=-DLLVM_VERSION_INFO="$LLVM_VERSION_INFO" VERBOSE=1 +COMMON_MAKEFLAGS="\ + UNIVERSAL=1 \ + UNIVERSAL_SDK_PATH=$SDKROOT \ + NO_RUNTIME_LIBS=1 \ + DISABLE_EDIS=1 \ + REQUIRES_RTTI=1 \ + DEBUG_SYMBOLS=1 \ + LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \ + LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \ + VERBOSE=1" # Build the LLVM tree universal. mkdir -p $DIR/obj-llvm || exit 1 @@ -146,7 +154,8 @@ if [ "$ARM_HOSTED_BUILD" = yes ]; then --program-prefix="" \ || exit 1 - make $COMMON_MAKEFLAGS SDKROOT= + make $JOBS_FLAG $COMMON_MAKEFLAGS SDKROOT= UNIVERSAL_ARCH="$HOSTS" \ + CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" if [ $? != 0 ] ; then echo "error: LLVM 'make' failed!" exit 1 @@ -174,7 +183,8 @@ else CPPFLAGS="$CPPFLAGS" \ || exit 1 - make $COMMON_MAKEFLAGS + make $JOBS_FLAG $COMMON_MAKEFLAGS UNIVERSAL_ARCH="$HOSTS" \ + CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" if [ $? != 0 ] ; then echo "error: LLVM 'make' failed!" exit 1 @@ -193,7 +203,7 @@ rm -rf * || exit 1 cd $DIR/obj-llvm || exit 1 # Install the tree into the destination directory. -make $COMMON_MAKEFLAGS install +make $JOBS_FLAG $COMMON_MAKEFLAGS UNIVERSAL_ARCH="$HOSTS" install if ! test $? == 0 ; then echo "error: LLVM 'make install' failed!" exit 1 |