From aa62da6d1694dc1a1ed7440691d1cd184713674d Mon Sep 17 00:00:00 2001 From: Chan Lee Date: Sat, 14 Dec 2024 19:45:42 +0800 Subject: [PATCH] fix incorrect zig-cc toolchain wrapper path on Windows --- xmake/toolchains/zig/xmake.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xmake/toolchains/zig/xmake.lua b/xmake/toolchains/zig/xmake.lua index 4a92bb59d3..50701b6e73 100644 --- a/xmake/toolchains/zig/xmake.lua +++ b/xmake/toolchains/zig/xmake.lua @@ -29,11 +29,12 @@ toolchain("zig") -- @see https://github.com/xmake-io/xmake/issues/5610 function _setup_zigcc_wrapper(zig) + local script_suffix = is_host("windows") and ".cmd" or "" for _, tool in ipairs({"cc", "c++", "ar", "ranlib", "objcopy"}) do - local wrapper_path = path.join(os.tmpdir(), "zigcc", tool) + local wrapper_path = path.join(os.tmpdir(), "zigcc", tool) .. script_suffix if not os.isfile(wrapper_path) then if is_host("windows") then - io.writefile(wrapper_path .. ".cmd", ("@echo off\n\"%s\" %s %%*"):format(zig, tool)) + io.writefile(wrapper_path, ("@echo off\n\"%s\" %s %%*"):format(zig, tool)) else io.writefile(wrapper_path, ("#!/bin/bash\nexec \"%s\" %s \"$@\""):format(zig, tool)) os.runv("chmod", {"+x", wrapper_path}) @@ -67,7 +68,7 @@ toolchain("zig") toolchain:config_set("zig", zig) toolchain:config_set("zig_version", zig_version) toolchain:configs_save() - return true + return zig end end)