summaryrefslogtreecommitdiff
path: root/xmake/platforms/linux/check.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-06-22 22:51:28 +0800
committerruki <[email protected]>2018-06-22 11:08:51 +0800
commit8cffaa773fe48eaf4afe957ff09f8d80f88f68ca (patch)
treed6e50e819a9e19d916b8b625d46e1ff310318e26 /xmake/platforms/linux/check.lua
parent752e703e0041b6fd9770968693b0f625aa246d3e (diff)
improve find cross toolchain
Diffstat (limited to 'xmake/platforms/linux/check.lua')
-rw-r--r--xmake/platforms/linux/check.lua16
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