From 506eb998d1673ee55e080390c66f6a2c3db9e882 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 7 Oct 2019 10:20:05 -0700 Subject: linkers: Use PosixDynamicLinkerMixin for Cuda Since cuda is currently reimplementing all of the shared methods itself, including a bug fixed by the next patch. --- mesonbuild/linkers.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'mesonbuild/linkers.py') diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index c5c9813..65a7e2c 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -930,7 +930,7 @@ class OptlinkDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker): def get_allow_undefined_args(self) -> typing.List[str]: return [] -class CudaLinker(DynamicLinker): +class CudaLinker(PosixDynamicLinkerMixin, DynamicLinker): """Cuda linker (nvlink)""" @staticmethod def parse_version(): @@ -964,12 +964,6 @@ class CudaLinker(DynamicLinker): from .compilers import CudaCompiler return CudaCompiler.LINKER_PREFIX - def get_output_args(self, outname: str) -> typing.List[str]: - return ['-o', outname] - - def get_search_args(self, dirname: str) -> typing.List[str]: - return ['-L', dirname] - def fatal_warnings(self) -> typing.List[str]: return ['--warning-as-error'] @@ -980,6 +974,3 @@ class CudaLinker(DynamicLinker): suffix: str, soversion: str, darwin_versions: typing.Tuple[str, str], is_shared_module: bool) -> typing.List[str]: return [] - - def get_std_shared_lib_args(self) -> typing.List[str]: - return ['-shared'] -- cgit v1.1