From d08520cb15c059142d88af637e86de3b9855974d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 9 May 2022 07:40:10 -0400 Subject: mpitrampoline: Correct build environment (#30549) --- .../repos/builtin/packages/mpitrampoline/package.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/mpitrampoline/package.py b/var/spack/repos/builtin/packages/mpitrampoline/package.py index e0148908f3..e2a74e6657 100644 --- a/var/spack/repos/builtin/packages/mpitrampoline/package.py +++ b/var/spack/repos/builtin/packages/mpitrampoline/package.py @@ -65,16 +65,6 @@ class Mpitrampoline(CMakePackage): libraries = ['libmpitrampoline'] return find_libraries(libraries, root=self.prefix.lib, shared=True) - def setup_build_environment(self, env): - fflags = ['-fcray-pointer'] - if self.spec.satisfies('%apple-clang@11:'): - fflags.append('-fallow-argument-mismatch') - if self.spec.satisfies('%clang@11:'): - fflags.append('-fallow-argument-mismatch') - if self.spec.satisfies('%gcc@10:'): - fflags.append('-fallow-argument-mismatch') - env.set('FFLAGS', ' '.join(fflags)) - def setup_run_environment(self, env): # Because MPI implementations provide compilers, they have to add to # their run environments the code to make the compilers available. @@ -92,6 +82,16 @@ class Mpitrampoline(CMakePackage): env.set('MPITRAMPOLINE_CC', spack_cc) env.set('MPITRAMPOLINE_CXX', spack_cxx) env.set('MPITRAMPOLINE_FC', spack_fc) + fflags = [] + if (self.spec.satisfies('%apple-clang') or + self.spec.satisfies('%clang') or + self.spec.satisfies('%gcc')): + fflags.append('-fcray-pointer') + if (self.spec.satisfies('%apple-clang@11:') or + self.spec.satisfies('%clang@11:') or + self.spec.satisfies('%gcc@10:')): + fflags.append('-fallow-argument-mismatch') + env.set('FFLAGS', ' '.join(fflags)) def setup_dependent_package(self, module, dependent_spec): self.spec.mpicc = join_path(self.prefix.bin, 'mpicc') -- cgit v1.2.3-70-g09d2