diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-12-02 12:40:13 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-02 13:39:37 -0800 |
| commit | 52aa24e99733c2ad5da57f436823dbe56ca2164a (patch) | |
| tree | f0f88b6809a6427a42033f6441f302051a4d70fd | |
| parent | 11639dd922aadb82545e2bce4edc558467a1fa21 (diff) | |
| download | meson-52aa24e99733c2ad5da57f436823dbe56ca2164a.zip meson-52aa24e99733c2ad5da57f436823dbe56ca2164a.tar.gz meson-52aa24e99733c2ad5da57f436823dbe56ca2164a.tar.bz2 | |
linkers: Fix Apple and VS-like linkers always_args
Which would not call the super() method, thus overriding the default
behavior when it should have instead extended it.
| -rw-r--r-- | mesonbuild/linkers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 3251845..57760f7 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -595,7 +595,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): return self._apply_prefix('-undefined,error') def get_always_args(self) -> typing.List[str]: - return self._apply_prefix('-headerpad_max_install_names') + return self._apply_prefix('-headerpad_max_install_names') + super().get_always_args() def bitcode_args(self) -> typing.List[str]: return self._apply_prefix('-bitcode_bundle') @@ -818,7 +818,7 @@ class VisualStudioLikeLinkerMixin: return self._apply_prefix('/MACHINE:' + self.machine) + self._apply_prefix('/OUT:' + outputname) def get_always_args(self) -> typing.List[str]: - return self._apply_prefix('/nologo') + return self._apply_prefix('/nologo') + super().get_always_args() def get_search_args(self, dirname: str) -> typing.List[str]: return self._apply_prefix('/LIBPATH:' + dirname) |