diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-10-28 11:05:06 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-30 02:04:26 +0200 |
| commit | 712cbe056811ebdf0d7358ba07a874717a1c736f (patch) | |
| tree | f53b075e6c98b83157cb4a69d8dc571a8e11b816 | |
| parent | c9b7e5bd403971a268530838b25a051ab6310fef (diff) | |
| download | meson-712cbe056811ebdf0d7358ba07a874717a1c736f.zip meson-712cbe056811ebdf0d7358ba07a874717a1c736f.tar.gz meson-712cbe056811ebdf0d7358ba07a874717a1c736f.tar.bz2 | |
environment: Fix detection of swift linker
Apparently in some cases swift prints to stderr instead of stdout
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 8c343d6..588005b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1034,8 +1034,8 @@ class Environment: else: v = 'unknown version' linker = AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) - elif 'GNU' in o: - if 'gold' in o: + elif 'GNU' in o or 'GNU' in e: + if 'gold' in o or 'gold' in e: cls = GnuGoldDynamicLinker else: cls = GnuBFDDynamicLinker |