diff options
| author | Marius Kintel <marius@kintel.net> | 2012-08-22 03:27:02 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-10-23 02:04:49 (GMT) |
| commit | ed27859e65b46a63a7dbd48227643b5e5b528f08 (patch) | |
| tree | 4db133faaf839da19187653a7ac6207093d2754a /scripts/macosx-build-dependencies.sh | |
| parent | 65fc1d6b01ade5e76fe712f93e2e108194c3291b (diff) | |
Now builds on clang-4.0 on Mac OS X Lion
Conflicts:
scripts/macosx-build-dependencies.sh
Diffstat (limited to 'scripts/macosx-build-dependencies.sh')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 73e4118..b7bd2bd 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -26,6 +26,9 @@ DEPLOYDIR=$BASEDIR/install MAC_OSX_VERSION_MIN=10.5 OPTION_32BIT=true OPTION_LLVM=false +OPTION_CLANG=false +OPTION_GCC=false +DETECTED_LION=false export QMAKESPEC=macx-g++ printUsage() @@ -187,6 +190,9 @@ build_boost() if $OPTION_LLVM; then BOOST_TOOLSET="toolset=darwin-llvm" echo "using darwin : llvm : llvm-g++ ;" >> tools/build/v2/user-config.jam + elif $OPTION_CLANG; then + BOOST_TOOLSET="toolset=clang" + echo "using clang ;" >> tools/build/v2/user-config.jam fi ./b2 -d+2 $BOOST_TOOLSET cflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" linkflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" install install_name_tool -id $DEPLOYDIR/lib/libboost_thread.dylib $DEPLOYDIR/lib/libboost_thread.dylib @@ -319,15 +325,46 @@ if [[ $OSVERSION -ge 7 ]]; then # Somehow, qmake in Qt-4.8.2 doesn't detect Lion's gcc and falls back into # project file mode unless manually given a QMAKESPEC export QMAKESPEC=macx-llvm + DETECTED_LION=true else echo "Detected Snow Leopard or earlier" fi +USING_LLVM=false +USING_GCC=false +USING_CLANG=false if $OPTION_LLVM; then echo "Using LLVM compiler" export CC=llvm-gcc export CXX=llvm-g++ export QMAKESPEC=macx-llvm + USING_LLCM=true +elif $OPTION_GCC; then + USING_GCC=true +elif $OPTION_CLANG; then + USING_CLANG=true +elif $DETECTED_LION; then + USING_GCC=true +fi + +if $USING_LLVM; then + echo "Using gcc LLVM compiler" + export CC=llvm-gcc + export CXX=llvm-g++ + export QMAKESPEC=macx-llvm +elif $USING_GCC; then + echo "Using gcc compiler" + export CC=gcc + export CXX=g++ + export CPP=cpp + # Somehow, qmake in Qt-4.8.2 doesn't detect Lion's gcc and falls back into + # project file mode unless manually given a QMAKESPEC + export QMAKESPEC=macx-llvm +elif $USING_CLANG; then + echo "Using clang compiler" + export CC=clang + export CXX=clang++ + export QMAKESPEC=unsupported/macx-clang fi echo "Using basedir:" $BASEDIR |