summaryrefslogtreecommitdiff
path: root/xmake/toolchains/mingw/check.lua
diff options
context:
space:
mode:
Diffstat (limited to 'xmake/toolchains/mingw/check.lua')
-rw-r--r--xmake/toolchains/mingw/check.lua11
1 files changed, 6 insertions, 5 deletions
diff --git a/xmake/toolchains/mingw/check.lua b/xmake/toolchains/mingw/check.lua
index 9500341ca..22a13fadd 100644
--- a/xmake/toolchains/mingw/check.lua
+++ b/xmake/toolchains/mingw/check.lua
@@ -24,12 +24,12 @@ import("detect.sdks.find_mingw")
-- check the mingw toolchain
function main(toolchain)
- local mingw = find_mingw(config.get("mingw"), {verbose = true, bindir = config.get("bin"), cross = config.get("cross")})
+ local mingw = find_mingw(toolchain:config("mingw") or config.get("mingw"), {verbose = true, bindir = toolchain:bindir(), cross = toolchain:cross()})
if not mingw then
for _, package in ipairs(toolchain:packages()) do
local installdir = package:installdir()
if installdir and os.isdir(installdir) then
- mingw = find_mingw(installdir, {verbose = true, cross = config.get("cross")})
+ mingw = find_mingw(installdir, {verbose = true, cross = toolchain:cross()})
if mingw then
break
end
@@ -37,9 +37,10 @@ function main(toolchain)
end
end
if mingw then
- config.set("mingw", mingw.sdkdir, {force = true, readonly = true})
- config.set("cross", mingw.cross, {readonly = true, force = true})
- config.set("bin", mingw.bindir, {readonly = true, force = true})
+ toolchain:config_set("mingw", mingw.sdkdir)
+ toolchain:config_set("cross", mingw.cross)
+ toolchain:config_set("bindir", mingw.bindir)
+ toolchain:configs_save()
else
-- failed
cprint("${bright color.error}please run:")