Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions mesonbuild/compilers/mixins/visualstudio.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from mesonbuild.linkers.linkers import ClangClDynamicLinker, MSVCDynamicLinker

if T.TYPE_CHECKING:
from ...build import BuildTarget
from ...build import BuildTarget, Build
from ...environment import Environment
from .clike import CLikeCompiler as Compiler
else:
Expand Down Expand Up @@ -480,10 +480,13 @@ def use_linker_args(cls, linker: str, version: str) -> T.List[str]:
return ['-fuse-ld=lld-link']
return super().use_linker_args(linker, version)

def _sanitize_linker_args(self, args: T.List[str]) -> T.List[str]:
return [flag[4:] if flag.startswith('-Wl,') else flag for flag in args]

def linker_to_compiler_args(self, args: T.List[str]) -> T.List[str]:
# clang-cl forwards arguments span-wise with the /LINK flag
# therefore -Wl will be received by lld-link or LINK and rejected
return super().use_linker_args(self.linker.id, '') + super().linker_to_compiler_args([flag[4:] if flag.startswith('-Wl,') else flag for flag in args])
return super().use_linker_args(self.linker.id, '') + super().linker_to_compiler_args(self._sanitize_linker_args(args))

def openmp_link_flags(self) -> T.List[str]:
# see https://github.com/mesonbuild/meson/issues/5298
Expand Down Expand Up @@ -516,3 +519,6 @@ def get_lto_link_args(self, *, target: T.Optional[BuildTarget] = None, threads:
# is safe to assume that all versions of clang-cl support LTO
args.append(f'/threads:{threads}')
return args

def get_build_link_args(self, target: BuildTarget, build: Build) -> T.List[str]:
return self._sanitize_linker_args(super().get_build_link_args(target, build))
Copy link
Copy Markdown
Author

@lucascolley lucascolley Mar 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is called at

commands += linker.get_build_link_args(target, self.build)
where the linker is (bare) lld-link when using it with clang-cl. Hence, we want the same stripping of -Wl, as occurs at
largs += [l for l in self.linker_to_compiler_args(la) if l != '/link']
in build_wrapper_args.

Loading