From d0bd89e6a0e87a7b9bf454404328af735b4c01d7 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Mon, 22 Apr 2013 13:35:05 -0400 Subject: We cannot target 10.5 while building on Mountain lion due to a compiler/sdk incompatibility. This should fix the build error by selecting 10.6 as a build target. Fixes #335 diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 3687041..2d0aaa4 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -29,6 +29,7 @@ OPTION_LLVM=false OPTION_CLANG=false OPTION_GCC=false DETECTED_LION=false +DETECTED_MOUNTAIN_LION=false export QMAKESPEC=macx-g++ printUsage() @@ -371,11 +372,14 @@ do done OSVERSION=`sw_vers -productVersion | cut -d. -f2` -if [[ $OSVERSION -ge 7 ]]; then - echo "Detected Lion or later" +if [[ $OSVERSION -ge 8 ]]; then + echo "Detected Mountain Lion (10.8) or later" + DETECTED_MOUNTAIN_LION=true +elif [[ $OSVERSION -ge 7 ]]; then + echo "Detected Lion (10.7) or later" DETECTED_LION=true else - echo "Detected Snow Leopard or earlier" + echo "Detected Snow Leopard (10.6) or earlier" fi USING_LLVM=false @@ -411,6 +415,20 @@ elif $USING_CLANG; then export QMAKESPEC=unsupported/macx-clang fi +if $DETECTED_MOUNTAIN_LION; then + echo "Setting build target to 10.6 or later" + MAC_OSX_VERSION_MIN=10.6 +else + echo "Setting build target to 10.5 or later" + MAC_OSX_VERSION_MIN=10.5 +fi + +if $OPTION_32BIT; then + echo "Building combined 32/64-bit binaries" +else + echo "Building 64-bit binaries" +fi + echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_qt 4.8.4 -- cgit v0.10.1