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

boost.py: use a different variable to not overwrite tags when matching libs (with python)

This commit is contained in:
Syl 2014-06-18 00:12:30 +02:00
parent 398c505d3d
commit 679fe6f807
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
waflib/extras/boost.py
View File

@ -256,10 +256,12 @@ def boost_get_libs(self, *k, **kw):
t.append('(%s%s)' % (is_static and '-s' or '-', kw['abi']))
elif is_static:
t.append('(-s)')
tags = t and ''.join(t) or ''
tags_pat = t and ''.join(t) or ''
for lib in lib_names:
if lib == 'python':
tags = '%s?(-py%s)?' % (tags, kw['python'])
tags = '%s?(-py%s)?' % (tags_pat, kw['python'])
else:
tags = tags_pat
# Trying libraries, from most strict match to least one
for pattern in ['boost_%s%s%s%s' % (lib, toolset_pat, tags, version),
'boost_%s%s%s' % (lib, tags, version),