mirror of https://gitlab.com/ita1024/waf.git
boost: fix removal of lib extension
This commit is contained in:
parent
f1d78d1246
commit
d2bd00ec5a
|
@ -270,10 +270,12 @@ def boost_get_libs(self, *k, **kw):
|
||||||
return file
|
return file
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
# extensions from Tools.ccroot.lib_patterns
|
||||||
|
wo_ext = re.compile(r"\.(a|so|lib|dll|dylib)$")
|
||||||
def format_lib_name(name):
|
def format_lib_name(name):
|
||||||
if name.startswith('lib') and self.env.CC_NAME != 'msvc':
|
if name.startswith('lib') and self.env.CC_NAME != 'msvc':
|
||||||
name = name[3:]
|
name = name[3:]
|
||||||
return name[:name.rfind('.')]
|
return wo_ext.sub("", name)
|
||||||
|
|
||||||
def match_libs(lib_names, is_static):
|
def match_libs(lib_names, is_static):
|
||||||
libs = []
|
libs = []
|
||||||
|
@ -522,4 +524,3 @@ def install_boost(self):
|
||||||
except:
|
except:
|
||||||
continue
|
continue
|
||||||
install_boost.done = False
|
install_boost.done = False
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue