mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-13 14:47:00 +00:00
Apple GCC 4.2 builds things differently. It no longer spawns a bunch of
processes, but requires the project to use -j. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49744 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
cc51c31953
commit
ff140fa1f1
@ -95,10 +95,39 @@ else
|
||||
LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION"
|
||||
fi
|
||||
|
||||
# Note: Don't pass -jN here. Building universal already has parallelism and we
|
||||
# don't want to make the builders hit swap by firing off too many gcc's at the
|
||||
# same time.
|
||||
make $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
|
||||
GCC_VER=`cc --version 2>/dev/null | sed 1q`
|
||||
|
||||
if echo "$GCC_VER" | grep GCC > /dev/null; then
|
||||
GCC_VER=`echo $GCC_VER | sed -e 's/.*(GCC) \([0-9.][0-9.]*\).*/\1/'`
|
||||
MAJ_VER=`echo $GCC_VER | sed 's/\..*//'`
|
||||
MIN_VER=`echo $GCC_VER | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
|
||||
fi
|
||||
|
||||
JOBS_FLAG=""
|
||||
|
||||
# Note: If compiling with GCC 4.0, don't pass the -jN flag. Building universal
|
||||
# already has parallelism and we don't want to make the builders hit swap by
|
||||
# firing off too many gccs at the same time.
|
||||
if [ "x$MAJ_VER" != "x4" -o "x$MIN_VER" != "x0" ]; then
|
||||
# Figure out how many make processes to run.
|
||||
SYSCTL=`sysctl -n hw.activecpu`
|
||||
|
||||
# hw.activecpu only available in 10.2.6 and later
|
||||
if [ -z "$SYSCTL" ]; then
|
||||
SYSCTL=`sysctl -n hw.ncpu`
|
||||
fi
|
||||
|
||||
# sysctl -n hw.* does not work when invoked via B&I chroot /BuildRoot.
|
||||
# Builders can default to 2, since even if they are single processor,
|
||||
# nothing else is running on the machine.
|
||||
if [ -z "$SYSCTL" ]; then
|
||||
SYSCTL=2
|
||||
fi
|
||||
|
||||
JOBS_FLAG="-j $SYSCTL"
|
||||
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\"'"
|
||||
|
Loading…
Reference in New Issue
Block a user