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
else
LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION"
fi
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`
# Figure out how many make processes to run.
SYSCTL=`sysctl -n hw.activecpu`
--enable-optimized=$LLVM_OPTIMIZED \
--disable-bindings"
--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
# Build the LLVM tree universal.
mkdir -p $DIR/obj-llvm || exit 1
--program-prefix="" \
|| exit 1
--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
if [ $? != 0 ] ; then
echo "error: LLVM 'make' failed!"
exit 1
CPPFLAGS="$CPPFLAGS" \
|| exit 1
CPPFLAGS="$CPPFLAGS" \
|| exit 1
+ 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
if [ $? != 0 ] ; then
echo "error: LLVM 'make' failed!"
exit 1
cd $DIR/obj-llvm || exit 1
# Install the tree into the destination directory.
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
if ! test $? == 0 ; then
echo "error: LLVM 'make install' failed!"
exit 1