diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-06-18 12:08:02 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-06 14:44:31 -0700 |
| commit | 7e0767bae41eb693993d03bfb75abca1171959c5 (patch) | |
| tree | ab56ea089f5393a6d293d9388993be6d405a4338 /mesonbuild/compilers/detect.py | |
| parent | a97fd83c8bfb428c5bc8fc82f08bc1180b4b67ca (diff) | |
| download | meson-7e0767bae41eb693993d03bfb75abca1171959c5.tar.gz | |
compilers: do not use coredata.set_options
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/compilers/detect.py')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index a0ae8108d..71081fedc 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -674,11 +674,13 @@ def detect_cuda_compiler(env: 'Environment', for_machine: MachineChoice) -> Comp cls = CudaCompiler env.add_lang_args(cls.language, cls, for_machine) key = OptionKey('cuda_link_args', machine=for_machine) + if for_machine is MachineChoice.BUILD and not is_cross: + key = key.as_host() if key in env.options: # To fix LDFLAGS issue val = env.options[key] assert isinstance(val, list) - env.coredata.set_options({key: cls.to_host_flags_base(val, Phase.LINKER)}) + env.coredata.optstore.set_option(key, cls.to_host_flags_base(val, Phase.LINKER)) linker = CudaLinker(compiler, for_machine, CudaCompiler.LINKER_PREFIX, [], version=CudaLinker.parse_version()) return cls(ccache, compiler, version, for_machine, is_cross, host_compiler=cpp_compiler, info=info, linker=linker) raise EnvironmentException(f'Could not find suitable CUDA compiler: "{"; ".join([" ".join(c) for c in compilers])}"') |