summaryrefslogtreecommitdiff
path: root/xmake/toolchains/zig/xmake.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-11-10 23:48:29 +0800
committerruki <[email protected]>2020-11-10 23:48:29 +0800
commit4de40c8e54d44e5f0d99efc6791b2ee5466156e2 (patch)
tree78d2676fb1b423cddc855629a913cae8f8ba09c5 /xmake/toolchains/zig/xmake.lua
parent85aa5fce76f7dd92dc618a4ae1ef20579b5e5ccd (diff)
improve zig support for 0.7.0
Diffstat (limited to 'xmake/toolchains/zig/xmake.lua')
-rw-r--r--xmake/toolchains/zig/xmake.lua15
1 files changed, 9 insertions, 6 deletions
diff --git a/xmake/toolchains/zig/xmake.lua b/xmake/toolchains/zig/xmake.lua
index 5735a4722..0ba11436f 100644
--- a/xmake/toolchains/zig/xmake.lua
+++ b/xmake/toolchains/zig/xmake.lua
@@ -25,14 +25,17 @@ toolchain("zig")
set_homepage("https://ziglang.org/")
set_description("Zig Programming Language Compiler")
- -- set toolset
- set_toolset("zc", "$(env ZC)", "zig")
- set_toolset("zcar", "$(env ZC)", "zig")
- set_toolset("zcld", "$(env ZC)", "zig")
- set_toolset("zcsh", "$(env ZC)", "zig")
-
-- on load
on_load(function (toolchain)
+
+ -- set toolset
+ local zig = get_config("zc") or "zig"
+ toolchain:set("toolset", "zc", "$(env ZC)", zig)
+ toolchain:set("toolset", "zcar", "$(env ZC)", zig)
+ toolchain:set("toolset", "zcld", "$(env ZC)", zig)
+ toolchain:set("toolset", "zcsh", "$(env ZC)", zig)
+
+ -- init flags
local march
if toolchain:is_plat("macosx") then
-- FIXME