diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-25 16:17:19 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:13:25 +0100 |
commit | 20cfe045356aa573570936028511a35b121c20ad (patch) | |
tree | 71e13a84b16e08a9a0a61852d79cf599132c3ab7 /mkspecs/unsupported/macx-iosdevice-clang/qmake.conf | |
parent | de5553aad52f8a8343d53bac5e9d29bcd67fbf2c (diff) |
iOS: Remove hard-coding of Xcode /Developer path in common/ios mkspecs
We can use xcode-select -print-path to get the /Developer directory.
This also removes the need for the "legacy" makespecs, which only
differ from their non-legacy counterparts in the location of the
Xcode developer directory.
Change-Id: Ia9245033a4b82cc3933226bf998f07177b60871f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/unsupported/macx-iosdevice-clang/qmake.conf')
-rw-r--r-- | mkspecs/unsupported/macx-iosdevice-clang/qmake.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf index 777b5ab6e2..ed6852e0d6 100644 --- a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf +++ b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf @@ -18,11 +18,11 @@ include(../../common/ios/qmake.conf) lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later") # iOS build tools -QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool -id -QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq -QMAKE_RANLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s +QMAKE_CC = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang +QMAKE_CXX = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +QMAKE_FIX_RPATH = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool -id +QMAKE_AR = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq +QMAKE_RANLIB = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX |