cuda: disable thin archives when cuda is added through `add_languages('cuda')` later
(cherry picked from commit 7f2c6f644b83f27d1f46aacf8ac59722498529ff)
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 04b0270..2e7a525 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -487,13 +487,12 @@
# hence we disable them if 'cuda' is enabled globally. See also
# - https://github.com/mesonbuild/meson/pull/9453
# - https://github.com/mesonbuild/meson/issues/9479#issuecomment-953485040
- self._allow_thin_archives = PerMachine[bool](
- 'cuda' not in self.environment.coredata.compilers.build,
- 'cuda' not in self.environment.coredata.compilers.host) if self.environment else PerMachine[bool](True, True)
- if not self._allow_thin_archives.build:
- mlog.debug('cuda enabled globally, disabling thin archives for build machine, since nvcc/nvlink cannot handle thin archives natively')
- if not self._allow_thin_archives.host:
- mlog.debug('cuda enabled globally, disabling thin archives for host machine, since nvcc/nvlink cannot handle thin archives natively')
+ self.allow_thin_archives = PerMachine[bool](True, True)
+ if self.environment:
+ for for_machine in MachineChoice:
+ if 'cuda' in self.environment.coredata.compilers[for_machine]:
+ mlog.debug('cuda enabled globally, disabling thin archives for {}, since nvcc/nvlink cannot handle thin archives natively'.format(for_machine))
+ self.allow_thin_archives[for_machine] = False
def create_phony_target(self, dummy_outfile: str, rulename: str, phony_infilename: str) -> NinjaBuildElement:
'''
@@ -3253,7 +3252,7 @@
if target.import_filename:
commands += linker.gen_import_library_args(self.get_import_filename(target))
elif isinstance(target, build.StaticLibrary):
- produce_thin_archive = self._allow_thin_archives[target.for_machine] and not target.should_install()
+ produce_thin_archive = self.allow_thin_archives[target.for_machine] and not target.should_install()
commands += linker.get_std_link_args(self.environment, produce_thin_archive)
else:
raise RuntimeError('Unknown build target type.')
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index 47d0d2d..732ad70 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -1518,6 +1518,10 @@
continue
else:
raise
+ if lang == 'cuda' and hasattr(self.backend, 'allow_thin_archives'):
+ # see NinjaBackend.__init__() why we need to disable thin archives for cuda
+ mlog.debug('added cuda as language, disabling thin archives for {}, since nvcc/nvlink cannot handle thin archives natively'.format(for_machine))
+ self.backend.allow_thin_archives[for_machine] = False
else:
# update new values from commandline, if it applies
self.coredata.process_compiler_options(lang, comp, self.environment, self.subproject)
