From 3fd460bce76cafbc55a98c143245d81c1996c59d Mon Sep 17 00:00:00 2001 From: Andrei Alexeyev Date: Tue, 24 Sep 2019 20:01:42 +0300 Subject: Fix GNU-like LLD being misdetected as MSVC-like LLD Affects the latest version of the llvm-mingw toolchain --- mesonbuild/environment.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 42524a8..ee5b568 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -717,7 +717,10 @@ class Environment: check_args = prefix + ['/logo'] + prefix + ['--version'] p, o, _ = Popen_safe(compiler + check_args) if o.startswith('LLD'): - return ClangClDynamicLinker(for_machine, exelist=compiler, prefix=prefix, version=search_version(o)) + if '(compatible with GNU linkers)' in o: + return LLVMDynamicLinker(compiler, for_machine, 'lld', prefix, version=search_version(o)) + else: + return ClangClDynamicLinker(for_machine, exelist=compiler, prefix=prefix, version=search_version(o)) elif o.startswith('Microsoft'): match = re.search(r'.*(X86|X64|ARM|ARM64).*', o) if match: -- cgit v1.1