summaryrefslogtreecommitdiff
path: root/var/spack/repos/builtin/packages/wrf/package.py
diff options
context:
space:
mode:
Diffstat (limited to 'var/spack/repos/builtin/packages/wrf/package.py')
-rw-r--r--var/spack/repos/builtin/packages/wrf/package.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py
index 7a488d2db3..c186d7785e 100644
--- a/var/spack/repos/builtin/packages/wrf/package.py
+++ b/var/spack/repos/builtin/packages/wrf/package.py
@@ -150,16 +150,12 @@ class Wrf(Package):
patch("patches/4.2/var.gen_be.Makefile.patch", when="@4.2:")
patch("patches/4.2/Makefile.patch", when="@4.2")
patch("patches/4.2/tirpc_detect.patch", when="@4.2")
- patch("patches/4.2/add_aarch64.patch", when="@4.2:4.3.1 %gcc")
- patch("patches/4.2/add_aarch64_acfl.patch", when="@4.2:4.3.1 %arm")
+ patch("patches/4.2/add_aarch64.patch", when="@4.2:")
patch("patches/4.2/configure_aocc_2.3.patch", when="@4.2 %aocc@:2.4.0")
patch("patches/4.2/configure_aocc_3.0.patch", when="@4.2: %aocc@3.0.0:3.2.0")
patch("patches/4.2/hdf5_fix.patch", when="@4.2: %aocc")
patch("patches/4.2/derf_fix.patch", when="@4.2 %aocc")
- patch("patches/4.3/add_aarch64.patch", when="@4.3.2: %gcc")
- patch("patches/4.3/add_aarch64_acfl.patch", when="@4.3.2: %arm")
-
patch("patches/4.4/arch.postamble.patch", when="@4.4:")
patch("patches/4.4/configure.patch", when="@4.4:")
# Various syntax fixes found by FPT tool
@@ -329,7 +325,7 @@ class Wrf(Package):
# Remove broken default options...
self.do_configure_fixup()
- if self.spec.compiler.name not in ["intel", "gcc", "aocc", "fj", "arm"]:
+ if self.spec.compiler.name not in ["intel", "gcc", "aocc", "fj"]:
raise InstallError(
"Compiler %s not currently supported for WRF build." % self.spec.compiler.name
)