diff options
Diffstat (limited to 'xmake/platforms/linux/check.lua')
| -rw-r--r-- | xmake/platforms/linux/check.lua | 16 |
1 files changed, 7 insertions, 9 deletions
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 |