6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-27 13:30:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix quoting problems from my previous change. <rdar://problem/13001651>

Browse Source 
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
This commit is contained in:
Bob Wilson 2013-01-12 02:31:42 +00:00
parent 0e385450fc
commit 6f4ccaf287
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/buildit/build_llvm
View File

@ -88,7 +88,6 @@ if [ "x$LLVM_SUBMIT_SUBVERSION" = "x00" -o "x$LLVM_SUBMIT_SUBVERSION" = "x0" ];
else else
LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION" LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION"
fi fi
LLVM_VERSION_INFO="'\" Apple Build #$LLVM_VERSION\"'"
# Figure out how many make processes to run. # Figure out how many make processes to run.
SYSCTL=`sysctl -n hw.activecpu` SYSCTL=`sysctl -n hw.activecpu`
@ -106,7 +105,16 @@ COMMON_CONFIGURE_OPTS="\
--enable-optimized=$LLVM_OPTIMIZED \ --enable-optimized=$LLVM_OPTIMIZED \
--disable-bindings" --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. # Build the LLVM tree universal.
mkdir -p $DIR/obj-llvm || exit 1 mkdir -p $DIR/obj-llvm || exit 1
@ -146,7 +154,8 @@ if [ "$ARM_HOSTED_BUILD" = yes ]; then
--program-prefix="" \ --program-prefix="" \
|| exit 1 || 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 if [ $? != 0 ] ; then
echo "error: LLVM 'make' failed!" echo "error: LLVM 'make' failed!"
exit 1 exit 1
@ -174,7 +183,8 @@ else
CPPFLAGS="$CPPFLAGS" \ CPPFLAGS="$CPPFLAGS" \
|| exit 1 || exit 1
make $COMMON_MAKEFLAGS make $JOBS_FLAG $COMMON_MAKEFLAGS UNIVERSAL_ARCH="$HOSTS" \
CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'"
if [ $? != 0 ] ; then if [ $? != 0 ] ; then
echo "error: LLVM 'make' failed!" echo "error: LLVM 'make' failed!"
exit 1 exit 1
@ -193,7 +203,7 @@ rm -rf * || exit 1
cd $DIR/obj-llvm || exit 1 cd $DIR/obj-llvm || exit 1
# Install the tree into the destination directory. # Install the tree into the destination directory.
make $COMMON_MAKEFLAGS install make $JOBS_FLAG $COMMON_MAKEFLAGS UNIVERSAL_ARCH="$HOSTS" install
if ! test $? == 0 ; then if ! test $? == 0 ; then
echo "error: LLVM 'make install' failed!" echo "error: LLVM 'make install' failed!"
exit 1 exit 1