diff options
Diffstat (limited to 'xmake/modules/private/utils/toolchain.lua')
| -rw-r--r-- | xmake/modules/private/utils/toolchain.lua | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/xmake/modules/private/utils/toolchain.lua b/xmake/modules/private/utils/toolchain.lua index cd2f20736..af165080f 100644 --- a/xmake/modules/private/utils/toolchain.lua +++ b/xmake/modules/private/utils/toolchain.lua @@ -467,16 +467,7 @@ function add_llvm_runenvs(toolchain) for _, dir in ipairs({dirs.libdir or false, dirs.cxxlibdir or false, dirs.rtlibdir or false}) do if dir then if toolchain:is_plat("windows") or is_host("windows") then - -- The dynamic libraries (DLLs) for Clang ASan and MSVC ASan share the same filename, making them incompatible. - -- Currently, runenvs maybe have Visual Studio environment variables. - -- If the Clang path is not prioritized (placed first), the system incorrectly loads the MSVC ASan DLL, resulting in a runtime failure. - local runenvs = toolchain:get("runenvs") - if runenvs and runenvs["PATH"] then - runenvs["PATH"] = table.wrap(runenvs["PATH"]) - table.insert(runenvs["PATH"], 1, dir) - else - toolchain:add("runenvs", "PATH", dir) - end + toolchain:add("runenvs", "PATH", dir) elseif toolchain:is_plat("linux", "bsd") then toolchain:add("runenvs", "LD_LIBRARY_PATH", dir) elseif toolchain:is_plat("macosx") then |