Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try using abi-tag to get libname and globber on windows.

This commit is contained in:
Benjamin Redelings 2018-02-07 13:40:36 -05:00
parent a517c657fa
commit ead02636dc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/dependencies/misc.py
View File

@ -381,6 +381,9 @@ class BoostDependency(ExternalDependency):
if self.is_debug:
libname = libname + '-gd'
libname = libname + "-{}.lib".format(self.version.replace('.', '_'))
mlog.log("original libname: '{}'".format(libname))
libname = 'lib' + name + self.abi_tag() + '.lib'
mlog.log("abi-tag libname: '{}'".format(libname))
if os.path.isfile(os.path.join(self.libdir, libname)):
self.lib_modules[self.modname_from_filename(libname)] = [libname]
else:
@ -397,6 +400,9 @@ class BoostDependency(ExternalDependency):
if self.is_debug:
globber2 = globber2 + '-gd'
globber2 = globber2 + '-{}'.format(self.version.replace('.', '_'))
mlog.log("original globber2: '{}'".format(globber2))
globber2 = globber1 + self.abi_tag()
mlog.log("abi-tag globber2: '{}'".format(globber2))
globber2_matches = glob.glob(os.path.join(self.libdir, globber2 + '.lib'))
for entry in globber2_matches:
fname = os.path.basename(entry)