diff options
| author | Martin Storsjö <martin@martin.st> | 2024-07-04 12:04:31 +0300 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-04 11:56:50 -0400 |
| commit | 1ca002a78a48faaf74aa61fcd28b4f2fa5937b47 (patch) | |
| tree | 85ce23508b02004751ecb773ee7f5957536cfb95 | |
| parent | 8b757b1f2d6f81d907f9d2bc60182185266a4aaa (diff) | |
| download | meson-1ca002a78a48faaf74aa61fcd28b4f2fa5937b47.tar.gz | |
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.
| -rw-r--r-- | mesonbuild/linkers/detect.py | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |