From 8f8922b1d60a0ad06e5a7e10775cde7ea8ef1438 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Tue, 8 Nov 2011 21:22:47 -0600 Subject: [PATCH] OS X Lion build fix: remove GCC_VERSION=4.2 only if building on Lion. --- scripts/configure_firestorm.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index bbcea34fab..3fafa85c0c 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -378,7 +378,11 @@ fi if [ $WANTS_BUILD -eq $TRUE ] ; then echo "Building $PLATFORM..." if [ $PLATFORM == "darwin" ] ; then - xcodebuild -configuration $BTYPE -project Firestorm.xcodeproj GCC_VERSION=4.2 GCC_OPTIMIZATION_LEVEL=3 GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee -a $LOG + if [ $OSTYPE == "darwin11" ] ; then + xcodebuild -configuration $BTYPE -project Firestorm.xcodeproj GCC_OPTIMIZATION_LEVEL=3 GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee -a $LOG + else + xcodebuild -configuration $BTYPE -project Firestorm.xcodeproj GCC_VERSION=4.2 GCC_OPTIMIZATION_LEVEL=3 GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee -a $LOG + fi elif [ $PLATFORM == "linux32" ] ; then JOBS=`cat /proc/cpuinfo | grep processor | wc -l` make -j $JOBS | tee -a $LOG