diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2011-09-26 22:30:57 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2011-09-26 22:30:57 +0000 |
| commit | 05a5c109e09d69d60e3ff7100c709472f8af98ec (patch) | |
| tree | c7443ec0fe6664680b22d8857d45e40dd0a15b2a /utils/buildit | |
| parent | 256e10f96461f6a06c0ff3fe892981f40626791e (diff) | |
| download | external_llvm-05a5c109e09d69d60e3ff7100c709472f8af98ec.zip external_llvm-05a5c109e09d69d60e3ff7100c709472f8af98ec.tar.gz external_llvm-05a5c109e09d69d60e3ff7100c709472f8af98ec.tar.bz2 | |
Remove old hack for compiling with gcc-4.0.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140573 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/buildit')
| -rwxr-xr-x | utils/buildit/build_llvm | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm index d52c475..3d03a50 100755 --- a/utils/buildit/build_llvm +++ b/utils/buildit/build_llvm @@ -142,32 +142,15 @@ else LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION" fi -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` - - # 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" +# Figure out how many make processes to run. +SYSCTL=`sysctl -n hw.activecpu` +# 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" make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$HOSTS" \ UNIVERSAL_SDK_PATH=$SDKROOT \ |