diff options
author | Laurin-Luis Lehning <65224843+e820@users.noreply.github.com> | 2020-12-13 15:34:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-13 16:34:50 +0200 |
commit | bab108742244bdfde769ea34424a0c0722a460c2 (patch) | |
tree | 915c955f1ceb63e668a2c166be35a80f2954ff89 /mesonbuild/environment.py | |
parent | b8052f9e50ce26f7f6914f0fe7d2a3b101ab14e9 (diff) | |
download | meson-bab108742244bdfde769ea34424a0c0722a460c2.zip meson-bab108742244bdfde769ea34424a0c0722a460c2.tar.gz meson-bab108742244bdfde769ea34424a0c0722a460c2.tar.bz2 |
Add support for driving lld-link indirectly through clang on Windows
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 5 insertions, 1 deletions
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: |