From 50f76f613182bc106cae426f024d14fd28351f5a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 1 Aug 2020 13:29:17 -0700 Subject: Hotfix: move CUDAHOSTCXX (#17826) * Hotfix: move CUDAHOSTCXX Set only in dependent packages. * dependent compiler --- var/spack/repos/builtin/packages/cuda/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 5fd89cbaa1..90a8cba788 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -77,15 +77,16 @@ class Cuda(Package): depends_on('libxml2', when='@10.1.243:') def setup_build_environment(self, env): - env.set('CUDAHOSTCXX', self.compiler.cxx) if self.spec.satisfies('@10.1.243:'): libxml2_home = self.spec['libxml2'].prefix env.set('LIBXML2HOME', libxml2_home) env.append_path('LD_LIBRARY_PATH', libxml2_home.lib) + def setup_dependent_build_environment(self, env, dependent_spec): + env.set('CUDAHOSTCXX', dependent_spec.package.compiler.cxx) + def setup_run_environment(self, env): env.set('CUDA_HOME', self.prefix) - env.set('CUDAHOSTCXX', self.compiler.cxx) def install(self, spec, prefix): if os.path.exists('/tmp/cuda-installer.log'): -- cgit v1.2.3-70-g09d2