diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-11-13 11:23:21 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | 98e3ad7266a0237282145eaf948436bef8b1f0be (patch) | |
| tree | a3ba0cd14cc5073a385b99f8dcec0c47b3918bed | |
| parent | 67ffc65448358c62ff91e46cdf6b4f04f6c811b0 (diff) | |
| download | meson-98e3ad7266a0237282145eaf948436bef8b1f0be.tar.gz | |
compilers: Remove Environment parameter from CudaCompiler.get_ccbin_args
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 2be49a364..4b3b03508 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -550,7 +550,7 @@ class CudaCompiler(Compiler): # Use the -ccbin option, if available, even during sanity checking. # Otherwise, on systems where CUDA does not support the default compiler, # NVCC becomes unusable. - flags += self.get_ccbin_args(None, self.environment, '') + flags += self.get_ccbin_args(None, '') # If cross-compiling, we can't run the sanity check, only compile it. if self.is_cross and not self.environment.has_exe_wrapper(): @@ -649,7 +649,7 @@ class CudaCompiler(Compiler): return opts def get_option_compile_args(self, target: 'BuildTarget', subproject: T.Optional[str] = None) -> T.List[str]: - args = self.get_ccbin_args(target, self.environment, subproject) + args = self.get_ccbin_args(target, subproject) try: host_compiler_args = self.host_compiler.get_option_compile_args(target, subproject) @@ -674,7 +674,7 @@ class CudaCompiler(Compiler): return self._to_host_flags(host_compiler_args) def get_option_link_args(self, target: 'BuildTarget', subproject: T.Optional[str] = None) -> T.List[str]: - args = self.get_ccbin_args(target, self.environment, subproject) + args = self.get_ccbin_args(target, subproject) return args + self._to_host_flags(self.host_compiler.get_option_link_args(target, subproject), Phase.LINKER) def get_soname_args(self, prefix: str, shlib_name: str, suffix: str, soversion: str, @@ -784,15 +784,13 @@ class CudaCompiler(Compiler): def get_dependency_link_args(self, dep: 'Dependency') -> T.List[str]: return self._to_host_flags(super().get_dependency_link_args(dep), Phase.LINKER) - def get_ccbin_args(self, - target: 'T.Optional[BuildTarget]', - env: 'Environment', + def get_ccbin_args(self, target: 'T.Optional[BuildTarget]', subproject: T.Optional[str] = None) -> T.List[str]: key = self.form_compileropt_key('ccbindir').evolve(subproject=subproject) if target: - ccbindir = env.coredata.get_option_for_target(target, key) + ccbindir = self.environment.coredata.get_option_for_target(target, key) else: - ccbindir = env.coredata.optstore.get_value_for(key) + ccbindir = self.environment.coredata.optstore.get_value_for(key) if isinstance(ccbindir, str) and ccbindir != '': return [self._shield_nvcc_list_arg('-ccbin='+ccbindir, False)] else: |