From bab108742244bdfde769ea34424a0c0722a460c2 Mon Sep 17 00:00:00 2001 From: Laurin-Luis Lehning <65224843+e820@users.noreply.github.com> Date: Sun, 13 Dec 2020 15:34:50 +0100 Subject: Add support for driving lld-link indirectly through clang on Windows --- mesonbuild/environment.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/environment.py') diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index faac0ed..c157bb2 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -940,6 +940,10 @@ class Environment: return LLVMDynamicLinker( compiler, for_machine, comp_class.LINKER_PREFIX, override, version=search_version(o)) + elif not invoked_directly: + return ClangClDynamicLinker( + for_machine, override, exelist=compiler, prefix=comp_class.LINKER_PREFIX, + version=search_version(o), direct=False, machine=None) if value is not None and invoked_directly: compiler = value @@ -1236,7 +1240,7 @@ class Environment: # style ld, but for clang on "real" windows we'll use # either link.exe or lld-link.exe try: - linker = self._guess_win_linker(compiler, cls, for_machine) + linker = self._guess_win_linker(compiler, cls, for_machine, invoked_directly=False) except MesonException: pass if linker is None: -- cgit v1.1