From 5f674a3318ddc91c31758dcba27d8a9d4d2b1299 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 19 Feb 2025 20:42:18 +0800 Subject: Fix clang-cl toolchain for msvc-wine --- xmake/toolchains/clang-cl/check.lua | 2 +- xmake/toolchains/clang-cl/load.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xmake/toolchains/clang-cl/check.lua b/xmake/toolchains/clang-cl/check.lua index 9f7022482..4537f01e3 100644 --- a/xmake/toolchains/clang-cl/check.lua +++ b/xmake/toolchains/clang-cl/check.lua @@ -30,7 +30,7 @@ function _find_clang_cl(vcvars) if pathenv then paths = path.splitenv(pathenv) end - return find_tool("clang-cl.exe", {version = true, force = true, paths = paths, envs = vcvars}) + return find_tool("clang-cl", {version = true, force = true, paths = paths, envs = vcvars}) end -- attempt to check vs environment diff --git a/xmake/toolchains/clang-cl/load.lua b/xmake/toolchains/clang-cl/load.lua index f73499118..1cf8de3dc 100644 --- a/xmake/toolchains/clang-cl/load.lua +++ b/xmake/toolchains/clang-cl/load.lua @@ -51,8 +51,8 @@ end function main(toolchain) -- set toolset - toolchain:set("toolset", "cc", "clang-cl.exe") - toolchain:set("toolset", "cxx", "clang-cl.exe") + toolchain:set("toolset", "cc", "clang-cl") + toolchain:set("toolset", "cxx", "clang-cl") toolchain:set("toolset", "mrc", "rc.exe") if toolchain:is_arch("x64") then toolchain:set("toolset", "as", "ml64.exe") -- cgit v1.3.1