From 24fb43cc43d908a421bddd26eb714338050d428b Mon Sep 17 00:00:00 2001 From: MichaelLaufer <70094649+MichaelLaufer@users.noreply.github.com> Date: Wed, 2 Dec 2020 00:21:19 +0200 Subject: Fixes compile time errors (#20006) Co-authored-by: michael laufer --- var/spack/repos/builtin/packages/wrf/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index b0a9fd450b..4841bd2a12 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -225,7 +225,7 @@ class Wrf(Package): for line in ifh: if line.startswith("DM_"): line = line.replace( - "mpif90 -f90=$(SFC)", self.spec['mpi'].mpif90 + "mpif90 -f90=$(SFC)", self.spec['mpi'].mpifc ) line = line.replace( "mpicc -cc=$(SCC)", self.spec['mpi'].mpicc @@ -289,7 +289,7 @@ class Wrf(Package): csh = Executable(csh_bin) # num of compile jobs capped at 20 in wrf - num_jobs = str(min(int(make_jobs, 10))) + num_jobs = str(min(int(make_jobs), 10)) # Now run the compile script and track the output to check for # failure/success We need to do this because upstream use `make -i -k` @@ -300,6 +300,8 @@ class Wrf(Package): "-j", num_jobs, self.spec.variants["compile_type"].value, + output=str, + error=str ) if "Executables successfully built" in result_buf: -- cgit v1.2.3-70-g09d2