|
| 1 | +--- old/qtbase/mkspecs/features/mac/sdk.prf 2018-02-08 10:24:48.000000000 -0800 |
| 2 | ++++ new/qtbase/mkspecs/features/mac/sdk.prf 2018-03-23 10:38:56.000000000 -0700 |
| 3 | +@@ -8,21 +8,21 @@ |
| 4 | + defineReplace(xcodeSDKInfo) { |
| 5 | + info = $$1 |
| 6 | + equals(info, "Path"): \ |
| 7 | +- info = --show-sdk-path |
| 8 | ++ infoarg = --show-sdk-path |
| 9 | + equals(info, "PlatformPath"): \ |
| 10 | +- info = --show-sdk-platform-path |
| 11 | ++ infoarg = --show-sdk-platform-path |
| 12 | + equals(info, "SDKVersion"): \ |
| 13 | +- info = --show-sdk-version |
| 14 | ++ infoarg = --show-sdk-version |
| 15 | + sdk = $$2 |
| 16 | + isEmpty(sdk): \ |
| 17 | + sdk = $$QMAKE_MAC_SDK |
| 18 | + |
| 19 | + isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { |
| 20 | +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") |
| 21 | ++ QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") |
| 22 | + # --show-sdk-platform-path won't work for Command Line Tools; this is fine |
| 23 | + # only used by the XCTest backend to testlib |
| 24 | +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ |
| 25 | +- error("Could not resolve SDK $$info for \'$$sdk\'") |
| 26 | ++ isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ |
| 27 | ++ error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") |
| 28 | + cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) |
| 29 | + } |
| 30 | + |
| 31 | +--- old/qtbase/configure 2018-02-08 10:24:48.000000000 -0800 |
| 32 | ++++ new/qtbase/configure 2018-03-23 05:42:29.000000000 -0700 |
| 33 | +@@ -232,8 +232,13 @@ |
| 34 | + |
| 35 | + sdk=$(getSingleQMakeVariable "QMAKE_MAC_SDK" "$1") |
| 36 | + if [ -z "$sdk" ]; then echo "QMAKE_MAC_SDK must be set when building on Mac" >&2; exit 1; fi |
| 37 | +- sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null) |
| 38 | +- if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi |
| 39 | ++ sysroot=$(getSingleQMakeVariable "QMAKE_MAC_SDK_PATH" "$1") |
| 40 | ++ |
| 41 | ++ echo "sysroot pre-configured as $sysroot"; |
| 42 | ++ if [ -z "$sysroot" ]; then |
| 43 | ++ sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null) |
| 44 | ++ if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi |
| 45 | ++ fi |
| 46 | + |
| 47 | + case "$sdk" in |
| 48 | + macosx*) |
| 49 | + |
| 50 | + |
0 commit comments