diff options
| author | ruki <[email protected]> | 2020-06-20 00:38:29 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-06-19 21:50:59 +0800 |
| commit | f5392149886b2083ec0d6db2adef3da405297fe8 (patch) | |
| tree | 12a41f554b7e4bce55a8fb6f8e46aee2c4eba3f9 /xmake/modules/detect/sdks/find_xcode.lua | |
| parent | ca1bd50cc1e0b5939311ac73c61180957763cbbc (diff) | |
improve xcode and msvc toolchains
Diffstat (limited to 'xmake/modules/detect/sdks/find_xcode.lua')
| -rw-r--r-- | xmake/modules/detect/sdks/find_xcode.lua | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_xcode.lua b/xmake/modules/detect/sdks/find_xcode.lua index 3b33ab955..a1ab709df 100644 --- a/xmake/modules/detect/sdks/find_xcode.lua +++ b/xmake/modules/detect/sdks/find_xcode.lua @@ -147,13 +147,19 @@ function main(sdkdir, opt) local plat = opt.plat or config.get("plat") or "macosx" local arch = opt.arch or config.get("arch") or "x86_64" + -- get xcode sdk version + local xcode_sdkver = (plat == config.plat()) and config.get("xcode_sdkver") + if not xcode_sdkver then + xcode_sdkver = config.get("xcode_sdkver_" .. plat) + end + -- find xcode - local xcode = _find_xcode(sdkdir or config.get("xcode") or global.get("xcode"), opt.sdkver or config.get("xcode_sdkver"), plat, arch) + local xcode = _find_xcode(sdkdir or config.get("xcode") or global.get("xcode"), opt.sdkver or xcode_sdkver, plat, arch) if xcode and xcode.sdkdir then -- save to config config.set("xcode", xcode.sdkdir, {force = true, readonly = true}) - config.set("xcode_sdkver", xcode.sdkver, {force = true, readonly = true}) + config.set("xcode_sdkver_" .. plat, xcode.sdkver, {force = true, readonly = true}) config.set("xcode_codesign_identity", xcode.codesign_identity, {force = true, readonly = true}) config.set("xcode_mobile_provision", xcode.mobile_provision, {force = true, readonly = true}) |