diff options
| author | Stephen Sachs <stesachs@amazon.com> | 2023-06-21 00:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 18:24:31 -0400 |
| commit | 0eec7c5c5375e2c51d7ac77ade803184e9e782e2 (patch) | |
| tree | cc4c4629220be74553fea4a96cf279cb81e5fb58 | |
| parent | 05dd24099702a6f47395e3e37704b6b868669735 (diff) | |
| download | spack-0eec7c5c5375e2c51d7ac77ade803184e9e782e2.tar.gz spack-0eec7c5c5375e2c51d7ac77ade803184e9e782e2.tar.bz2 spack-0eec7c5c5375e2c51d7ac77ade803184e9e782e2.tar.xz spack-0eec7c5c5375e2c51d7ac77ade803184e9e782e2.zip | |
[WRF] Always use compiler wrappers for FFLAGS/FCFLAGS (#38470)
`FFLAGS` and `FCFLAGS` are being ignored by WRF build system. Not only in version
`3.9.1.1`, but also `4.x`.
Also, I see no reason to explicitly add `-w` and `-O2` to compile lines when
using `gcc@10:`. Tested for version `3.9.1.1`, `4.2.2`, & `4.5.0`.
Tagging original authors of this part @MichaelLaufer and @giordano in case they
want to chime in.
| -rw-r--r-- | var/spack/repos/builtin/packages/wrf/package.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index a82fd57e72..103e3342f9 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -240,14 +240,6 @@ class Wrf(Package): env.set("JASPERINC", self.spec["jasper"].prefix.include) env.set("JASPERLIB", self.spec["jasper"].prefix.lib) - # These flags should be used also in v3, but FCFLAGS/FFLAGS aren't used - # consistently in that version of WRF, so we have to force them through - # `flag_handler` below. - if self.spec.satisfies("@4.0: %gcc@10:"): - args = "-w -O2 -fallow-argument-mismatch -fallow-invalid-boz" - env.set("FCFLAGS", args) - env.set("FFLAGS", args) - if self.spec.satisfies("%aocc"): env.set("WRFIO_NCD_LARGE_FILE_SUPPORT", 1) env.set("HDF5", self.spec["hdf5"].prefix) @@ -257,10 +249,9 @@ class Wrf(Package): env.set("ADIOS2", self.spec["adios2"].prefix) def flag_handler(self, name, flags): - # Same flags as FCFLAGS/FFLAGS above, but forced through the compiler - # wrapper when compiling v3.9.1.1. - if self.spec.satisfies("@3.9.1.1 %gcc@10:") and name == "fflags": - flags.extend(["-w", "-O2", "-fallow-argument-mismatch", "-fallow-invalid-boz"]) + # Force FCFLAGS/FFLAGS by adding directly into spack compiler wrappers. + if self.spec.satisfies("@3.9.1.1: %gcc@10:") and name == "fflags": + flags.extend(["-fallow-argument-mismatch", "-fallow-invalid-boz"]) return (flags, None, None) def patch(self): |