Commit ca23b4f8 authored by ita1024's avatar ita1024

Merge branch 'fix-boost-libname' into 'master'

boost: fix removal of lib extension

See merge request !2282
parents f1d78d12 d2bd00ec
...@@ -270,10 +270,12 @@ def boost_get_libs(self, *k, **kw): ...@@ -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): ...@@ -522,4 +524,3 @@ def install_boost(self):
except: except:
continue continue
install_boost.done = False install_boost.done = False
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment