From 3d74987c815b0cfcced02ad8659c1cd33e7d35d5 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 10 Sep 2019 22:43:34 -0700 Subject: [PATCH] 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 --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b3885b6ed..e67e744ca 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))