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/scripts | |
| 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/scripts')
| -rw-r--r-- | mesonbuild/scripts/symbolextractor.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py index 5240275..f4084be 100644 --- a/mesonbuild/scripts/symbolextractor.py +++ b/mesonbuild/scripts/symbolextractor.py @@ -124,9 +124,11 @@ def gnu_syms(libfilename: str, outfilename: str): def solaris_syms(libfilename: str, outfilename: str): # gnu_syms() works with GNU nm & readelf, not Solaris nm & elfdump origpath = os.environ['PATH'] - os.environ['PATH'] = '/usr/gnu/bin:' + origpath - gnu_syms(libfilename, outfilename) - os.environ['PATH'] = origpath + try: + os.environ['PATH'] = '/usr/gnu/bin:' + origpath + gnu_syms(libfilename, outfilename) + finally: + os.environ['PATH'] = origpath def osx_syms(libfilename: str, outfilename: str): # Get the name of the library |