diff options
| author | Martin Storsjö <martin@martin.st> | 2024-07-05 00:10:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 00:10:05 +0300 |
| commit | b298e2d2d2251767a5ddcdef2310494d3b8da773 (patch) | |
| tree | 60fd854ae6b6218e01fa7de17c1d6148d355e431 /lld/MinGW/Driver.cpp | |
| parent | c1a5f1ea363560961f52a62335658b445c51b491 (diff) | |
| download | llvm-b298e2d2d2251767a5ddcdef2310494d3b8da773.zip llvm-b298e2d2d2251767a5ddcdef2310494d3b8da773.tar.gz llvm-b298e2d2d2251767a5ddcdef2310494d3b8da773.tar.bz2 | |
[LLD] [MinGW] Reinstate the former spelling in the version message (#97698)
0f9fbbb63cfcd2069441aa2ebef622c9716f8dbb changed the version printouts.
This broke linker detection in Meson, when disambiguating between the
ld.lld and lld-link interfaces, in
https://github.com/mesonbuild/meson/blob/1.4.1/mesonbuild/linkers/detect.py#L67,
which checks for the string "(compatible with GNU linkers)" including
the parentheses.
Reinstate the parentheses in the printout here, for compatibility with
Meson. The printout looks a little odd in this form, "LLD 19.0.0
(https://github.com/llvm/llvm-project
173514d58ec4e6166670f1e37a038df3865c8b96) (compatible with GNU
linkers)", but works with Meson.
The Meson check is loosened in https://github.com/mesonbuild/meson/pull/13383,
but existing versions of Meson with the too strict check will be around
for quite some time, so we should only change LLD to the new form once
older versions of Meson aren't used for these targets any longer, i.e.
earliest within a few years.
Diffstat (limited to 'lld/MinGW/Driver.cpp')
| -rw-r--r-- | lld/MinGW/Driver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp index 1fd120a..35fd478 100644 --- a/lld/MinGW/Driver.cpp +++ b/lld/MinGW/Driver.cpp @@ -199,7 +199,7 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS, // a GNU compatible linker. As long as an output for the -v option // contains "GNU" or "with BFD", they recognize us as GNU-compatible. if (args.hasArg(OPT_v) || args.hasArg(OPT_version)) - message(getLLDVersion() + ", compatible with GNU linkers"); + message(getLLDVersion() + " (compatible with GNU linkers)"); // The behavior of -v or --version is a bit strange, but this is // needed for compatibility with GNU linkers. |