symbolextractor: use try/finally in solaris_syms when wrapping gnu_syms

As suggested by dcbaker in
https://github.com/mesonbuild/meson/pull/7370#pullrequestreview-436872661

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
pull/7422/head
Alan Coopersmith 5 years ago
parent 7ab0090d2a
commit e801e0435e
  1. 8
      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

Loading…
Cancel
Save