summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDom Heinzeller <dom.heinzeller@icloud.com>2023-12-14 01:42:34 -0700
committerGitHub <noreply@github.com>2023-12-14 09:42:34 +0100
commita972314fa6eb8ca15ba0535f13c833c5c1adebf7 (patch)
tree5e58b0cc416236fa584862c6d208f7c473d1b2b7
parent16d1ed35914262eea27cf41a2c99aea497adc17d (diff)
downloadspack-a972314fa6eb8ca15ba0535f13c833c5c1adebf7.tar.gz
spack-a972314fa6eb8ca15ba0535f13c833c5c1adebf7.tar.bz2
spack-a972314fa6eb8ca15ba0535f13c833c5c1adebf7.tar.xz
spack-a972314fa6eb8ca15ba0535f13c833c5c1adebf7.zip
Fix spack compiler wrappers in ESMF's esmf.mk on Cray when using cc, CC, ftn (#41640)
-rw-r--r--var/spack/repos/builtin/packages/esmf/package.py8
1 files changed, 8 insertions, 0 deletions
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")