From 06bbf6cf9353f6b336b6ddaa76c235af7a6092fb Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 9 Mar 2020 09:40:56 -0700 Subject: [PATCH] linkers: Move import_library_args to from VS compiler to linker This is the argument to name the implib when using the Visual Studio Linker. This is needed by LDC and DMD when using link.exe or lld-link.exe on windows, and is really a linker argument not a compiler argument. --- mesonbuild/compilers/mixins/visualstudio.py | 4 ---- mesonbuild/linkers.py | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py index a9943798d..44aefc845 100644 --- a/mesonbuild/compilers/mixins/visualstudio.py +++ b/mesonbuild/compilers/mixins/visualstudio.py @@ -205,10 +205,6 @@ class VisualStudioLikeCompiler(metaclass=abc.ABCMeta): objname = os.path.splitext(pchname)[0] + '.obj' return objname, ['/Yc' + header, '/Fp' + pchname, '/Fo' + objname] - def gen_import_library_args(self, implibname: str) -> T.List[str]: - "The name of the outputted import library" - return ['/IMPLIB:' + implibname] - def openmp_flags(self) -> T.List[str]: return ['/openmp'] diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 489525b77..d6ea0c9e0 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -872,6 +872,10 @@ class VisualStudioLikeLinkerMixin: is_shared_module: bool) -> T.List[str]: return [] + def import_library_args(self, implibname: str) -> T.List[str]: + """The command to generate the import library.""" + return self._apply_prefix(['/IMPLIB:' + implibname]) + class MSVCDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker):