summaryrefslogtreecommitdiff
path: root/xmake/modules
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-16 00:45:51 +0800
committerruki <[email protected]>2020-12-16 00:45:51 +0800
commitb3d4c235f88fb14f0aa42c2704727a104ab33fd2 (patch)
tree16583126000d6b88da0b1eaf1294a4aba692f72f /xmake/modules
parentdcdd8e5712a863fe225539a09671a7a6a73d60b6 (diff)
improve toolchain for xcode
Diffstat (limited to 'xmake/modules')
-rw-r--r--xmake/modules/detect/sdks/find_xcode.lua11
1 files changed, 1 insertions, 10 deletions
diff --git a/xmake/modules/detect/sdks/find_xcode.lua b/xmake/modules/detect/sdks/find_xcode.lua
index 1177685a5..a42ee1985 100644
--- a/xmake/modules/detect/sdks/find_xcode.lua
+++ b/xmake/modules/detect/sdks/find_xcode.lua
@@ -147,19 +147,12 @@ 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 xcode_sdkver, plat, arch)
+ local xcode = _find_xcode(sdkdir or config.get("xcode") or global.get("xcode"), opt.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_" .. 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})
@@ -191,7 +184,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.xcode = xcode or false
cache.save(key, cacheinfo)
-
- -- ok?
return xcode
end