diff options
| -rw-r--r-- | lld/MinGW/Driver.cpp | 2 | ||||
| -rw-r--r-- | lld/test/MinGW/driver.test | 4 |
2 files changed, 4 insertions, 2 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. diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test index 44ec588..cbccd09 100644 --- a/lld/test/MinGW/driver.test +++ b/lld/test/MinGW/driver.test @@ -268,7 +268,9 @@ APPCONTAINER: -appcontainer RUN: ld.lld -m i386pep --version 2>&1 | FileCheck -check-prefix=VERSION %s RUN: ld.lld -m i386pep -v 2>&1 | FileCheck -check-prefix=VERSION %s RUN: not ld.lld -m i386pep -v xyz 2>&1 | FileCheck -check-prefix=VERSION %s -VERSION: LLD {{.*}}, compatible with GNU linkers +# This literal string is required for compatibility with older Meson versions, +# see https://github.com/mesonbuild/meson/pull/13383. +VERSION: LLD {{.*}} (compatible with GNU linkers) RUN: ld.lld -m i386pep --help 2>&1 | FileCheck -check-prefix=HELP %s HELP: USAGE: |