summaryrefslogtreecommitdiffstats
path: root/config.tests/unix/compile.test
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-15 18:11:04 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-19 07:56:34 +0100
commit71b4325cb7031452e922531c78efdc16b8577648 (patch)
tree82e5f2f9aa12a08833effdbeab1bf5ff986b8bab /config.tests/unix/compile.test
parent3988ad95f757f7531e8133a10e83f74ab0ce1b96 (diff)
Clean up how we build against SDKs on Mac OS
Instead of setting -isysroot in both arch.test, compile.test, the various mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf. The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected to be of the short-form name, eg macosx or iphoneos, not a full path, as that's what Xcode also expects. We take care of translating that into a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as a helper. Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'config.tests/unix/compile.test')
-rwxr-xr-xconfig.tests/unix/compile.test5
1 files changed, 0 insertions, 5 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 3f8c5c51a2..79e7619d5b 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -32,11 +32,6 @@ while [ "$#" -gt 0 ]; do
MAC_ARCH_LFLAGS="$MAC_ARCH_LFLAGS -arch $2"
shift
;;
- -sdk)
- LFLAGS="$LFLAGS -Wl,-syslibroot,$2"
- CXXFLAGS="$CXXFLAGS -isysroot $2"
- shift
- ;;
-F*|-m*|-x*)
LFLAGS="$LFLAGS $PARAM"
CXXFLAGS="$CXXFLAGS $PARAM"