diff options
| author | Redbeanw44602 <[email protected]> | 2024-12-02 15:41:11 +0800 |
|---|---|---|
| committer | Redbeanw44602 <[email protected]> | 2024-12-03 00:13:12 +0800 |
| commit | 7b15bfb1f4f56e06bb9295c6325dcf8159d0139b (patch) | |
| tree | 389f3dd438fa21e6b3819f7f7e9ddb854ae9dce7 /xmake/toolchains/zig/xmake.lua | |
| parent | 3a7e44a68f05137631141d4b2b8f6a5e2c5641a2 (diff) | |
fix zig toolset.
* fix ar, wrong definition
* add ranlib & objcopy
* remove non-standard environment variable ZC
Diffstat (limited to 'xmake/toolchains/zig/xmake.lua')
| -rw-r--r-- | xmake/toolchains/zig/xmake.lua | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/xmake/toolchains/zig/xmake.lua b/xmake/toolchains/zig/xmake.lua index adff1be42..e72561547 100644 --- a/xmake/toolchains/zig/xmake.lua +++ b/xmake/toolchains/zig/xmake.lua @@ -59,17 +59,19 @@ toolchain("zig") if toolchain:config("zigcc") ~= false then -- we can use `set_toolchains("zig", {zigcc = false})` to disable zigcc -- @see https://github.com/xmake-io/xmake/issues/3251 - toolchain:set("toolset", "as", zig .. " cc") - toolchain:set("toolset", "cc", zig .. " cc") - toolchain:set("toolset", "cxx", zig .. " c++") - toolchain:set("toolset", "ld", zig .. " c++") - toolchain:set("toolset", "sh", zig .. " c++") + toolchain:set("toolset", "cc", zig .. " cc") + toolchain:set("toolset", "cxx", zig .. " c++") + toolchain:set("toolset", "ld", zig .. " c++") + toolchain:set("toolset", "sh", zig .. " c++") + toolchain:set("toolset", "ar", zig .. " ar") + toolchain:set("toolset", "ranlib", zig .. " ranlib") + toolchain:set("toolset", "objcopy", zig .. " objcopy") + toolchain:set("toolset", "as", zig .. " cc") end - toolchain:set("toolset", "ar", "$(env ZC)", 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) + toolchain:set("toolset", "zc", zig) + toolchain:set("toolset", "zcar", zig) + toolchain:set("toolset", "zcld", zig) + toolchain:set("toolset", "zcsh", zig) -- init arch if toolchain:is_arch("arm64", "arm64-v8a") then |