1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: fix sdk resolution on macos

Browse Source 
the 'info' variable was re-used too early. make a new one 'infoargs'
instead.

Task-number: QTBUG-67286
Change-Id: I77881ecbfce338d653358c5e5edac84e1c0c7de3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Tim Uy 2018-03-28 08:25:32 -07:00 committed by Oswald Buddenhagen
parent 34e34f2209
commit 30874fb2df
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkspecs/features/mac/sdk.prf
View File

@ -8,21 +8,21 @@ contains(QMAKE_MAC_SDK, .*/.*): \
defineReplace(xcodeSDKInfo) { defineReplace(xcodeSDKInfo) {
info = $$1 info = $$1
equals(info, "Path"): \ equals(info, "Path"): \
info = --show-sdk-path infoarg = --show-sdk-path
equals(info, "PlatformPath"): \ equals(info, "PlatformPath"): \
info = --show-sdk-platform-path infoarg = --show-sdk-platform-path
equals(info, "SDKVersion"): \ equals(info, "SDKVersion"): \
info = --show-sdk-version infoarg = --show-sdk-version
sdk = $$2 sdk = $$2
isEmpty(sdk): \ isEmpty(sdk): \
sdk = $$QMAKE_MAC_SDK sdk = $$QMAKE_MAC_SDK
isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
# --show-sdk-platform-path won't work for Command Line Tools; this is fine # --show-sdk-platform-path won't work for Command Line Tools; this is fine
# only used by the XCTest backend to testlib # only used by the XCTest backend to testlib
isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
error("Could not resolve SDK $$info for \'$$sdk\'") error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
} }