aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-03-09 09:40:56 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-03-09 16:55:08 -0700
commit06bbf6cf9353f6b336b6ddaa76c235af7a6092fb (patch)
tree6fb347f56831788619d47d6358b014fb093ddc90
parentc9ecfc84ffc685ff29ed488d15419401c2d22cb8 (diff)
downloadmeson-06bbf6cf9353f6b336b6ddaa76c235af7a6092fb.zip
meson-06bbf6cf9353f6b336b6ddaa76c235af7a6092fb.tar.gz
meson-06bbf6cf9353f6b336b6ddaa76c235af7a6092fb.tar.bz2
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.
-rw-r--r--mesonbuild/compilers/mixins/visualstudio.py4
-rw-r--r--mesonbuild/linkers.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
index a994379..44aefc8 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 489525b..d6ea0c9 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):