diff options
author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-09-01 15:19:38 -0400 |
---|---|---|
committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-09-05 11:50:17 -0400 |
commit | c8d380e4ef11cd1a72c785418f41dd420fbf6d1b (patch) | |
tree | 228197eb356c56d842588e4c014945072e7ff994 /mesonbuild/linkers.py | |
parent | caec875fe1922b40037e1fd9229433ede64f9f25 (diff) | |
download | meson-c8d380e4ef11cd1a72c785418f41dd420fbf6d1b.zip meson-c8d380e4ef11cd1a72c785418f41dd420fbf6d1b.tar.gz meson-c8d380e4ef11cd1a72c785418f41dd420fbf6d1b.tar.bz2 |
PGI: use ar link wrapper on Windows
Diffstat (limited to 'mesonbuild/linkers.py')
-rw-r--r-- | mesonbuild/linkers.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 6cce78b..e8218b0 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -740,18 +740,30 @@ class PGIDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): # PGI -shared is Linux only. if mesonlib.is_windows(): return ['-Bdynamic', '-Mmakedll'] - elif mesonlib.is_linux: + elif mesonlib.is_linux(): return ['-shared'] return [] def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str, rpath_paths: str, build_rpath: str, install_rpath: str) -> typing.List[str]: - if env.machines[self.for_machine].is_windows(): + if not env.machines[self.for_machine].is_windows(): return ['-R' + os.path.join(build_dir, p) for p in rpath_paths] return [] +class PGIStaticLinker(StaticLinker): + def __init__(self, exelist: typing.List[str]): + super().__init__(exelist) + self.id = 'ar' + self.std_args = ['-r'] + + def get_std_link_args(self) -> typing.List[str]: + return self.std_args + + def get_output_args(self, target: str) -> typing.List[str]: + return [target] + class VisualStudioLikeLinkerMixin: _BUILDTYPE_ARGS = { |