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>
pull/5917/head
Alan Coopersmith 5 years ago
parent d768a76ab2
commit 3d74987c81
  1. 2
      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))

Loading…
Cancel
Save