From caec875fe1922b40037e1fd9229433ede64f9f25 Mon Sep 17 00:00:00 2001 From: Kramer Peace Date: Tue, 3 Sep 2019 19:33:11 +0300 Subject: Create CUDA linker with CUDA compiler Since they are laways paired there is no need to "search" for the cuda linker. --- mesonbuild/compilers/cuda.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'mesonbuild/compilers') diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 0a26bed..57935d8 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -18,7 +18,7 @@ import typing from .. import mlog from ..mesonlib import EnvironmentException, MachineChoice, Popen_safe from .compilers import (Compiler, cuda_buildtype_args, cuda_optimization_args, - cuda_debug_args, CompilerType) + cuda_debug_args) if typing.TYPE_CHECKING: from ..environment import Environment # noqa: F401 @@ -34,7 +34,7 @@ class CudaCompiler(Compiler): super().__init__(exelist, version, for_machine, **kwargs) self.is_cross = is_cross self.exe_wrapper = exe_wrapper - self.id = CudaCompiler.cuda_id() + self.id = 'nvcc' default_warn_args = [] self.warn_args = {'0': [], '1': default_warn_args, @@ -42,10 +42,6 @@ class CudaCompiler(Compiler): '3': default_warn_args + ['-Xcompiler=-Wextra', '-Xcompiler=-Wpedantic']} - @staticmethod - def cuda_id(): - return 'nvcc' - def needs_static_linker(self): return False -- cgit v1.1