diff options
| -rw-r--r-- | xmake/core/package/package.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/c++/config/sanitizer.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/platform/windows/subsystem/xmake.lua | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 75e134b2a..b658b09f6 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -2493,7 +2493,7 @@ function _instance:_generate_sanitizer_configs(checkmode, sourcekind) kind = "static" end - local driver = self:has_tool("ld", "lld-link", "link") and "" or "-Wl," + local driver = self:has_tool("ld", "lld_link", "link") and "" or "-Wl," local thunk = path.join(libdir, string.format("clang_rt.asan_%s_runtime_thunk-x86_64.lib", kind)) table.join2(ldflags, { path.unix(path.join(libdir, "clang_rt.asan_dynamic-x86_64.lib")), diff --git a/xmake/rules/c++/config/sanitizer.lua b/xmake/rules/c++/config/sanitizer.lua index e6606efe9..1862d3e9b 100644 --- a/xmake/rules/c++/config/sanitizer.lua +++ b/xmake/rules/c++/config/sanitizer.lua @@ -72,7 +72,7 @@ function _add_build_sanitizer(target, sourcekind, checkmode) end local libdir = _get_clang_asan_library_dir(target) - local driver = target:has_tool("ld", "lld-link", "link") and "" or "-Wl," + local driver = target:has_tool("ld", "lld_link", "link") and "" or "-Wl," local thunk = path.join(libdir, string.format("clang_rt.asan_%s_runtime_thunk-x86_64.lib", kind)) table.join2(ldflags, { path.unix(path.join(libdir, "clang_rt.asan_dynamic-x86_64.lib")), diff --git a/xmake/rules/platform/windows/subsystem/xmake.lua b/xmake/rules/platform/windows/subsystem/xmake.lua index 87204e64f..b4985a3e1 100644 --- a/xmake/rules/platform/windows/subsystem/xmake.lua +++ b/xmake/rules/platform/windows/subsystem/xmake.lua @@ -40,7 +40,7 @@ rule("platform.windows.subsystem") if target:has_tool("ld", "clang", "clangxx", "clang_cl") then target:add("ldflags", {"-Xlinker", "-subsystem:" .. subsystem}, {force = true, expand = false}) - elseif target:has_tool("ld", "link", "lld-link") then + elseif target:has_tool("ld", "link", "lld_link") then target:add("ldflags", "/SUBSYSTEM:" .. subsystem:upper(), {force = true}) elseif target:has_tool("ld", "gcc", "gxx") then target:add("ldflags", "-m" .. subsystem, {force = true}) |