From 8b2809b4ac8183d71712d3853abba3bb34a4571a Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 24 Dec 2024 10:14:54 +0100 Subject: [PATCH] intel-oneapi-mpi: fix setting up dependent build environment --- .../builtin/packages/intel-oneapi-mpi/package.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index 3dd2aee4f61..c5c660dc898 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -194,11 +194,17 @@ def setup_dependent_package(self, module, dep_spec): def setup_dependent_build_environment(self, env, dependent_spec): dependent_module = dependent_spec.package.module - env.set("I_MPI_CC", dependent_module.spack_cc) - env.set("I_MPI_CXX", dependent_module.spack_cxx) - env.set("I_MPI_F77", dependent_module.spack_f77) - env.set("I_MPI_F90", dependent_module.spack_fc) - env.set("I_MPI_FC", dependent_module.spack_fc) + for var_name, attr_name in ( + ("I_MPI_CC", "spack_cc"), + ("I_MPI_CXX", "spack_cxx"), + ("I_MPI_FC", "spack_fc"), + ("I_MPI_F90", "spack_fc"), + ("I_MPI_F77", "spack_f77"), + ): + if not hasattr(dependent_module, attr_name): + continue + + env.set(var_name, getattr(dependent_module, attr_name)) # Set compiler wrappers for dependent build stage wrappers = self.wrapper_paths()