From 7a959ffbba6a410a25ec4fef6a6ff039d8c604e2 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 30 Oct 2018 22:03:53 +0000 Subject: Fix library implib name when name_prefix: is used Use the specified name_prefix for implib, rather than hardcoding it. (This is needed to allow an installed library given name_prefix:'' and a name starting with 'lib' to be linked with using -l. (This case is handled specially in the pkgconfig module)) --- mesonbuild/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 8bb49c0..2b6d8e9 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1562,8 +1562,8 @@ class SharedLibrary(BuildTarget): # For all other targets/platforms import_filename stays None elif for_windows(is_cross, env): suffix = 'dll' - self.vs_import_filename = '{0}.lib'.format(self.name) - self.gcc_import_filename = 'lib{0}.dll.a'.format(self.name) + self.vs_import_filename = '{0}{1}.lib'.format(self.prefix if self.prefix is not None else '', self.name) + self.gcc_import_filename = '{0}{1}.dll.a'.format(self.prefix if self.prefix is not None else 'lib', self.name) if self.get_using_msvc(): # Shared library is of the form foo.dll prefix = '' @@ -1582,7 +1582,7 @@ class SharedLibrary(BuildTarget): self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}' elif for_cygwin(is_cross, env): suffix = 'dll' - self.gcc_import_filename = 'lib{0}.dll.a'.format(self.name) + self.gcc_import_filename = '{0}{1}.dll.a'.format(self.prefix if self.prefix is not None else 'lib', self.name) # Shared library is of the form cygfoo.dll # (ld --dll-search-prefix=cyg is the default) prefix = 'cyg' -- cgit v1.1