summaryrefslogtreecommitdiff
path: root/util/crossgcc/buildgcc
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@google.com>2012-12-05 16:18:32 -0800
committerRonald G. Minnich <rminnich@gmail.com>2012-12-06 02:01:42 +0100
commit4266b92db06eae5c6aa3c8cc8eb2b873f40ecbba (patch)
tree1bfaa04778ff913c7d524c38c736a61d322b10e3 /util/crossgcc/buildgcc
parent0f5caa26cb0b25ae452a14aedc71f5c137850a4e (diff)
crossgcc: Fix buildgcc on Mac OS X
Once again, the compiler we use on Mac OS X had trouble compiling GCC. Switch to llvm-gcc because that one works with Xcode 4.5.2 and gcc 4.7.2. Also drop the -W flags not known to Xcode from the iasl Makefile, and drop the --remove-destination option from the copy, because that does not exist on Darwin. Change-Id: I9f978f65b5ae7edee2ecdcab337772e7a692bd9b Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1967 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'util/crossgcc/buildgcc')
-rwxr-xr-xutil/crossgcc/buildgcc29
1 files changed, 14 insertions, 15 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 8689e1ad1b..4424a4d05f 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -20,8 +20,8 @@
# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
#
-CROSSGCC_DATE="November 15th, 2012"
-CROSSGCC_VERSION="1.19"
+CROSSGCC_DATE="December 4th, 2012"
+CROSSGCC_VERSION="1.20"
# default settings
TARGETDIR=`pwd`/xgcc
@@ -336,12 +336,11 @@ if [ `uname` = "Darwin" ]; then
OPTIONS="ABI=32"
fi
- # In Xcode 4 the default compiler was switched to gcc-llvm.
- # However, this compiler fails to compile gcc 4.6.x. As a
- # workaround it's possible to compile gcc with gcc-4.2 or
- # clang.
+ # In Xcode 4.5.2 the default compiler is clang.
+ # However, this compiler fails to compile gcc 4.7.x. As a
+ # workaround it's possible to compile gcc with llvm-gcc.
if $CC -v 2>&1 | grep -q LLVM; then
- CC=clang
+ CC=llvm-gcc
fi
fi
@@ -599,17 +598,17 @@ printf "Building IASL ${IASL_VERSION} ... "
(
cd $IASL_DIR/generate/unix
export PATH=$PATH:$DESTDIR$TARGETDIR/bin
- rm -f ../../source/compiler/.failed
+ rm -f .failed
CFLAGS="$HOSTCFLAGS"
- $MAKE CC="$CC" iasl || touch ../../source/compiler/.failed
- rm -f $DESTDIR$TARGETDIR/bin/iasl || touch ../../source/compiler/.failed
- if [ -d bin32 ]; then cp bin32/iasl $DESTDIR$TARGETDIR/bin || touch ../../source/compiler/.failed ; fi
- if [ -d bin64 ]; then cp bin64/iasl $DESTDIR$TARGETDIR/bin || touch ../../source/compiler/.failed ; fi
- if [ ! -f ../../source/compiler/.failed ]; then touch ../../source/compiler/.success; fi
+ $MAKE CC="$CC" iasl || touch .failed
+ rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed
+ if [ -d bin32 ]; then cp bin32/iasl $DESTDIR$TARGETDIR/bin || touch .failed ; fi
+ if [ -d bin64 ]; then cp bin64/iasl $DESTDIR$TARGETDIR/bin || touch .failed ; fi
+ if [ ! -f .failed ]; then touch .success; fi
) > $IASL_DIR/source/compiler/crossgcc-build.log 2>&1
-test -r $IASL_DIR/source/compiler/.failed && printf "${RED}failed${NC}\n" || \
+test -r $IASL_DIR/generate/unix/.failed && printf "${RED}failed${NC}\n" || \
printf "${green}ok${NC}\n"
-test -r $IASL_DIR/source/compiler/.failed && exit 1
+test -r $IASL_DIR/generate/unix/.failed && exit 1
fi
if [ $SAVETEMPS -eq 0 ]; then