FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplification in syms.py

This commit is contained in:
Thomas Nagy 2013-06-27 22:22:25 +02:00
parent 9a1d7bf0ce
commit 76f0a02f9f
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
waflib/extras/syms.py
View File

@ -25,11 +25,7 @@ class gen_sym(Task):
kw = {}
if 'msvc' in (self.env.CC_NAME, self.env.CXX_NAME):
re_nm = re.compile(r'External\s+\|\s+_(' + self.generator.export_symbols_regex + r')\b')
if 'DUMPBIN' in self.env:
cmd = [self.env['DUMPBIN']]
else:
cmd = ['dumpbin']
cmd += ['/symbols', obj.abspath()]
cmd = [self.env.DUMPBIN or 'dumpbin', '/symbols', obj.abspath()]
# Dumpbin requires custom environment sniffed out by msvc.py earlier
if self.env['PATH']:
@ -42,11 +38,7 @@ class gen_sym(Task):
re_nm = re.compile(r'T\s+_(' + self.generator.export_symbols_regex + r')\b')
else:
re_nm = re.compile(r'T\s+(' + self.generator.export_symbols_regex + r')\b')
if 'NM' in self.env:
cmd = [self.env['NM']]
else:
cmd = 'nm'
cmd += ['-g', obj.abspath()]
cmd = [self.env.NM or 'nm', '-g', obj.abspath()]
syms = re_nm.findall(self.generator.bld.cmd_and_log(cmd, quiet=STDOUT, **kw))
self.outputs[0].write('%r' % syms)