diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-07-14 20:46:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 20:46:19 +0300 |
| commit | b6ea3eec1f62ea003b609b77aa1aabe00f4990f5 (patch) | |
| tree | 6a89a2ba33cc36b80c382802aaa0b7d8aaa00d5a /mesonbuild/environment.py | |
| parent | 825ba92b98347cfe470fad605da467e59d699efb (diff) | |
| parent | 20d405ec18845a18694e4985701dd89523d6dc73 (diff) | |
| download | meson-b6ea3eec1f62ea003b609b77aa1aabe00f4990f5.zip meson-b6ea3eec1f62ea003b609b77aa1aabe00f4990f5.tar.gz meson-b6ea3eec1f62ea003b609b77aa1aabe00f4990f5.tar.bz2 | |
Merge pull request #7422 from alanc/solaris-fixes
Solaris fixes revisited
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index bf09a88..00922c1 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -930,9 +930,15 @@ class Environment: cls = GnuBFDDynamicLinker linker = cls(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) elif 'Solaris' in e or 'Solaris' in o: + for line in (o+e).split('\n'): + if 'ld: Software Generation Utilities' in line: + v = line.split(':')[2].lstrip() + break + else: + v = 'unknown version' linker = SolarisDynamicLinker( compiler, for_machine, comp_class.LINKER_PREFIX, override, - version=search_version(e)) + version=v) else: raise EnvironmentException('Unable to determine dynamic linker') return linker |