diff options
Diffstat (limited to 'xmake/toolchains/xcode/check.lua')
| -rw-r--r-- | xmake/toolchains/xcode/check.lua | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/xmake/toolchains/xcode/check.lua b/xmake/toolchains/xcode/check.lua index 927eadceb..30886e584 100644 --- a/xmake/toolchains/xcode/check.lua +++ b/xmake/toolchains/xcode/check.lua @@ -26,11 +26,23 @@ import("detect.sdks.find_xcode") -- main entry function main(toolchain) + -- get apple device + local simulator + local appledev = toolchain:config("appledev") or config.get("appledev") + if appledev and appledev == "simulator" then + simulator = true + appledev = "simulator" + elseif not toolchain:is_plat("macosx") and toolchain:is_arch("i386", "x86_64") then + simulator = true + appledev = "simulator" + end + -- find xcode local xcode_sdkver = toolchain:config("xcode_sdkver") or config.get("xcode_sdkver") local xcode = find_xcode(config.get("xcode"), {force = true, verbose = true, find_codesign = toolchain:is_global(), sdkver = xcode_sdkver, + appledev = appledev, plat = toolchain:plat(), arch = toolchain:arch()}) if not xcode then @@ -59,17 +71,6 @@ function main(toolchain) end end - -- get apple device - local simulator - local appledev = toolchain:config("appledev") or config.get("appledev") - if appledev and appledev == "simulator" then - simulator = true - appledev = "simulator" - elseif not toolchain:is_plat("macosx") and toolchain:is_arch("i386", "x86_64") then - simulator = true - appledev = "simulator" - end - -- save xcode sysroot directory local xcode_sysroot if xcode.sdkdir and xcode_sdkver then @@ -102,13 +103,7 @@ function main(toolchain) -- local target_minver = toolchain:config("target_minver") or config.get("target_minver") if xcode_sdkver and not target_minver then - target_minver = xcode_sdkver - if toolchain:is_plat("macosx") then - local macos_ver = macos.version() - if macos_ver then - target_minver = macos_ver:major() .. "." .. macos_ver:minor() - end - end + target_minver = xcode.target_minver end toolchain:config_set("xcode", xcode.sdkdir) toolchain:config_set("xcode_sdkver", xcode_sdkver) |