From 81544feffe4f3f1dc3e429db8bbff7054b31c3dd Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 15 Feb 2016 13:33:29 +0530 Subject: Explicitly use the import library while generating link args for a target --- mesonbuild/backend/backends.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'mesonbuild/backend/backends.py') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index cab3b8f..c660f71 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -87,6 +87,14 @@ class Backend(): filename = os.path.join(targetdir, fname) return filename + def get_target_filename_for_linking(self, target): + # On some platforms (msvc for instance), the file that is used for + # dynamic linking is not the same as the dynamic library itself. This + # file is called an import library, and we want to link against that. + # On platforms where this distinction is not important, the import + # library is the same as the dynamic library itself. + return os.path.join(self.get_target_dir(target), target.get_import_filename()) + def get_target_dir(self, target): if self.environment.coredata.get_builtin_option('layout') == 'mirror': dirname = target.get_subdir() @@ -263,11 +271,7 @@ class Backend(): if not isinstance(d, build.StaticLibrary) and\ not isinstance(d, build.SharedLibrary): raise RuntimeError('Tried to link with a non-library target "%s".' % d.get_basename()) - fname = self.get_target_filename(d) - if compiler.id == 'msvc': - if fname.endswith('dll'): - fname = fname[:-3] + 'lib' - args.append(fname) + args.append(self.get_target_filename_for_linking(d)) # If you have executable e that links to shared lib s1 that links to shared library s2 # you have to specify s2 as well as s1 when linking e even if e does not directly use # s2. Gcc handles this case fine but Clang does not for some reason. Thus we need to -- cgit v1.1