From 1ca002a78a48faaf74aa61fcd28b4f2fa5937b47 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Thu, 4 Jul 2024 12:04:31 +0300 Subject: linkers: Loosen the check for GNU interface style in LLD for Windows Don't require the string to be enclosed in parentheses. https://github.com/llvm/llvm-project/pull/97323 changed the LLD version printout to no longer be enclosed in parentheses, which made Meson fail to detect the linker style used here. The LLD change is being reverted in https://github.com/llvm/llvm-project/pull/97698 in order to fix building with existing Meson versions, but for the future, loosen the check slightly, to not require the parentheses. --- mesonbuild/linkers/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py index 1db3948c1..cd3c7b2ef 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py @@ -64,7 +64,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty p, o, _ = Popen_safe(compiler + check_args) if 'LLD' in o.split('\n', maxsplit=1)[0]: - if '(compatible with GNU linkers)' in o: + if 'compatible with GNU linkers' in o: return linkers.LLVMDynamicLinker( compiler, for_machine, comp_class.LINKER_PREFIX, override, version=search_version(o)) -- cgit v1.2.3