summaryrefslogtreecommitdiff
path: root/xmake/modules/private/utils/toolchain.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2024-06-03 10:08:21 +0800
committerGitHub <[email protected]>2024-06-03 10:08:21 +0800
commita62a73914de453b93a9ccfe38c909d52e155ca61 (patch)
tree6c1dfae8a8e09ad602905d80a673ca125ef5b58f /xmake/modules/private/utils/toolchain.lua
parent91fd4825abfbe66407ef1a248038411628786723 (diff)
Update toolchain.lua
Diffstat (limited to 'xmake/modules/private/utils/toolchain.lua')
-rw-r--r--xmake/modules/private/utils/toolchain.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/private/utils/toolchain.lua b/xmake/modules/private/utils/toolchain.lua
index 93fd81fcf..6297ec8e2 100644
--- a/xmake/modules/private/utils/toolchain.lua
+++ b/xmake/modules/private/utils/toolchain.lua
@@ -31,18 +31,18 @@ function is_compatible_with_host(name)
end
end
--- toolset v144 doesn't exist and will cause issues with cmake/vs generation
-local vs_toolset_mapping = {
- ["v144"] = "v143"
-}
-
+-- get vs toolset version, e.g. v143, v144, ..
function get_vs_toolset_ver(vs_toolset)
local toolset_ver
if vs_toolset then
local verinfo = vs_toolset:split('%.')
if #verinfo >= 2 then
toolset_ver = "v" .. verinfo[1] .. (verinfo[2]:sub(1, 1) or "0")
- toolset_ver = vs_toolset_mapping[toolset_ver] or toolset_ver
+ end
+
+ -- @see https://github.com/xmake-io/xmake/pull/5176
+ if toolset_ver and toolset_ver == "v144" and vs_toolset:startswith("14.40.") then
+ toolset_ver = "v143"
end
end
return toolset_ver