diff options
| author | ruki <[email protected]> | 2023-01-06 23:22:23 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-01-06 23:22:23 +0800 |
| commit | b01f145c1e6aff3abfaaf42a9cd8ce493c786c44 (patch) | |
| tree | 7f11f5ada667892cd097e3df1ca8ada2adec2af4 | |
| parent | 59e2cfba89e79d1373f11d38262ff23db33679bb (diff) | |
improve zig toolchain
| -rw-r--r-- | tests/projects/zig/console_c_call_zig/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/toolchains/zig/xmake.lua | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/tests/projects/zig/console_c_call_zig/xmake.lua b/tests/projects/zig/console_c_call_zig/xmake.lua index 548bcacb8..c110e0236 100644 --- a/tests/projects/zig/console_c_call_zig/xmake.lua +++ b/tests/projects/zig/console_c_call_zig/xmake.lua @@ -1,7 +1,10 @@ add_rules("mode.debug", "mode.release") +add_requires("zig >=0.10") + target("demo") set_kind("binary") add_files("src/*.c") add_files("src/*.zig") + set_toolchains("@zig", {zigcc = false}) diff --git a/xmake/toolchains/zig/xmake.lua b/xmake/toolchains/zig/xmake.lua index ebfa4a00c..2f97b0340 100644 --- a/xmake/toolchains/zig/xmake.lua +++ b/xmake/toolchains/zig/xmake.lua @@ -55,10 +55,14 @@ toolchain("zig") -- set toolset -- we patch target to `zig cc` to fix has_flags. see https://github.com/xmake-io/xmake/issues/955#issuecomment-766929692 local zig = toolchain:config("zig") or "zig" - toolchain:set("toolset", "cc", zig .. " cc") - toolchain:set("toolset", "cxx", zig .. " c++") - toolchain:set("toolset", "ld", zig .. " c++") - toolchain:set("toolset", "sh", zig .. " c++") + 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", "cc", zig .. " cc") + toolchain:set("toolset", "cxx", zig .. " c++") + toolchain:set("toolset", "ld", zig .. " c++") + toolchain:set("toolset", "sh", zig .. " c++") + end toolchain:set("toolset", "ar", "$(env ZC)", zig) toolchain:set("toolset", "zc", "$(env ZC)", zig) toolchain:set("toolset", "zcar", "$(env ZC)", zig) @@ -92,7 +96,8 @@ toolchain("zig") -- xmake f -p cross --toolchain=zig --cross=mips64el-linux-gnuabi64 target = toolchain:cross() elseif toolchain:is_plat("macosx") then - target = arch .. "-macos-gnu" + -- zig 0.10 will raise `unable to find or provide libc for target 'x86_64-macos.11.7.1...13-gnu'` + --target = arch .. "-macos-gnu" elseif toolchain:is_plat("linux") then if arch == "arm" then target = "arm-linux-gnueabi" |