Merge pull request #7164 from xmake-io/clangcl

fix envs for clang-cl

1 files changed, 5 insertions, 4 deletions

diff --git a/xmake/modules/private/utils/toolchain.lua b/xmake/modules/private/utils/toolchain.lua
index 48aabdffa..263137300 100644
--- a/xmake/modules/private/utils/toolchain.lua
+++ b/xmake/modules/private/utils/toolchain.lua
@@ -180,14 +180,15 @@ function get_clang_target_flags(toolchain)
 end
 
 -- add vs environments
-function add_vsenvs(toolchain, expect_vars)
+function add_vsenvs(toolchain, opt)
+    opt = opt or {}
     local curenvs = os.getenvs()
-    expect_vars = expect_vars or {"PATH", "LIB", "INCLUDE", "LIBPATH"}
-    for _, name in ipairs(expect_vars) do
+    local varnames = opt.varnames or {"PATH", "LIB", "INCLUDE", "LIBPATH"}
+    for _, name in ipairs(varnames) do
         _add_vsenv(toolchain, name, curenvs)
     end
     for _, name in ipairs(find_vstudio.get_vcvars()) do
-        if not table.contains(expect_vars, name:upper()) then
+        if not table.contains(varnames, name:upper()) then
             _add_vsenv(toolchain, name, curenvs)
         end
     end