diff options
Diffstat (limited to 'xmake/platforms')
| -rw-r--r-- | xmake/platforms/cross/check.lua | 16 | ||||
| -rw-r--r-- | xmake/platforms/linux/check.lua | 16 | ||||
| -rw-r--r-- | xmake/platforms/mingw/check.lua | 16 |
3 files changed, 21 insertions, 27 deletions
diff --git a/xmake/platforms/cross/check.lua b/xmake/platforms/cross/check.lua index 183a20985..d05a8f492 100644 --- a/xmake/platforms/cross/check.lua +++ b/xmake/platforms/cross/check.lua @@ -23,7 +23,7 @@ -- -- imports -import("detect.sdks.find_cross_toolchains") +import("detect.sdks.find_cross_toolchain") import(".checker") -- check the architecture @@ -44,15 +44,13 @@ function _toolchains(config) return _g.TOOLCHAINS end - -- find cross toolchains + -- find cross toolchain local cross = "" - for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do - if toolchain.bin and toolchain.cross then - config.set("cross", toolchain.cross, {readonly = true, force = true}) - config.set("toolchains", toolchain.bin, {readonly = true, force = true}) - cross = toolchain.cross - break - end + local toolchain = find_cross_toolchain(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")}) + if toolchain then + config.set("cross", toolchain.cross, {readonly = true, force = true}) + config.set("toolchains", toolchain.bin, {readonly = true, force = true}) + cross = toolchain.cross end -- init toolchains diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua index 6031839e1..0910ff86b 100644 --- a/xmake/platforms/linux/check.lua +++ b/xmake/platforms/linux/check.lua @@ -23,7 +23,7 @@ -- -- imports -import("detect.sdks.find_cross_toolchains") +import("detect.sdks.find_cross_toolchain") import(".checker") -- check the architecture @@ -49,15 +49,13 @@ function _toolchains(config) return _g.TOOLCHAINS end - -- find cross toolchains + -- find cross toolchain local cross = "" - for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do - if toolchain.bin and toolchain.cross then - config.set("cross", toolchain.cross, {readonly = true, force = true}) - config.set("toolchains", toolchain.bin, {readonly = true, force = true}) - cross = toolchain.cross - break - end + local toolchain = find_cross_toolchain(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")}) + if toolchain then + config.set("cross", toolchain.cross, {readonly = true, force = true}) + config.set("toolchains", toolchain.bin, {readonly = true, force = true}) + cross = toolchain.cross end -- init toolchains diff --git a/xmake/platforms/mingw/check.lua b/xmake/platforms/mingw/check.lua index bb5654665..0b2c2b870 100644 --- a/xmake/platforms/mingw/check.lua +++ b/xmake/platforms/mingw/check.lua @@ -23,7 +23,7 @@ -- -- imports -import("detect.sdks.find_cross_toolchains") +import("detect.sdks.find_cross_toolchain") import(".checker") -- get toolchains @@ -40,15 +40,13 @@ function _toolchains(config) arch = "i686" end - -- find cross toolchains + -- find cross toolchain local cross = "" - for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do - if toolchain.bin and toolchain.cross and toolchain.cross:find(arch) then - config.set("cross", toolchain.cross) - config.set("toolchains", toolchain.bin) - cross = toolchain.cross - break - end + local toolchain = find_cross_toolchain(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")}) + if toolchain then + config.set("cross", toolchain.cross, {readonly = true, force = true}) + config.set("toolchains", toolchain.bin, {readonly = true, force = true}) + cross = toolchain.cross end -- make toolchains |