From a972314fa6eb8ca15ba0535f13c833c5c1adebf7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 14 Dec 2023 01:42:34 -0700 Subject: Fix spack compiler wrappers in ESMF's esmf.mk on Cray when using cc, CC, ftn (#41640) --- var/spack/repos/builtin/packages/esmf/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 7cf4fb6767..d3b19b9fac 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -136,6 +136,14 @@ class Esmf(MakefilePackage): # https://github.com/spack/spack/issues/35957 patch("esmf_cpp_info.patch") + # This is strictly required on Cray systems that use + # the Cray compiler wrappers, where we need to swap + # out the spack compiler wrappers in esmf.mk with the + # Cray wrappers. It doesn't hurt/have any effect on + # other systems where the logic in setup_build_environment + # below sets the compilers to the MPI wrappers. + filter_compiler_wrappers("esmf.mk", relative_root="lib") + # Make script from mvapich2.patch executable @when("@:7.0") @run_before("build") -- cgit v1.2.3-60-g2f50