diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-09-10 22:43:34 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-09-10 22:43:34 -0700 |
| commit | 3d74987c815b0cfcced02ad8659c1cd33e7d35d5 (patch) | |
| tree | 015ac8207c3cd65f1c34b830c3960394d0167cfb | |
| parent | d768a76ab21f01fe34119d79d5b4b580d9fe564f (diff) | |
| download | meson-3d74987c815b0cfcced02ad8659c1cd33e7d35d5.zip meson-3d74987c815b0cfcced02ad8659c1cd33e7d35d5.tar.gz meson-3d74987c815b0cfcced02ad8659c1cd33e7d35d5.tar.bz2 | |
compilers: Recognize Solaris 11.4 linker
Solaris 11.3 & earlier sent the --version output to stderr, but
Solaris 11.4 moved it to stdout in an attempt to be more compatible
with the GNU tools, so look for it in both streams of output.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b3885b6..e67e744 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -745,7 +745,7 @@ class Environment: else: i = 'GNU ld.bfd' linker = GnuDynamicLinker(compiler, for_machine, i, prefix, version=v) - elif 'Solaris' in e: + elif 'Solaris' in e or 'Solaris' in o: linker = SolarisDynamicLinker( compiler, for_machine, 'solaris', prefix, version=search_version(e)) |