zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes compile time errors (#20006)

Browse Source 
Co-authored-by: michael laufer <michael.laufer@toganetworks.com>
This commit is contained in:
MichaelLaufer 2020-12-02 00:21:19 +02:00 committed by Tamara Dahlgren
parent 0b7a22dea2
commit 24fb43cc43
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/wrf/package.py
View File

@ -225,7 +225,7 @@ def do_configure_fixup(self):
for line in ifh: for line in ifh:
if line.startswith("DM_"): if line.startswith("DM_"):
line = line.replace( line = line.replace(
"mpif90 -f90=$(SFC)", self.spec['mpi'].mpif90 "mpif90 -f90=$(SFC)", self.spec['mpi'].mpifc
) )
line = line.replace( line = line.replace(
"mpicc -cc=$(SCC)", self.spec['mpi'].mpicc "mpicc -cc=$(SCC)", self.spec['mpi'].mpicc
@ -289,7 +289,7 @@ def run_compile_script(self):
csh = Executable(csh_bin) csh = Executable(csh_bin)
# num of compile jobs capped at 20 in wrf # 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 # 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` # failure/success We need to do this because upstream use `make -i -k`
@ -300,6 +300,8 @@ def run_compile_script(self):
"-j", "-j",
num_jobs, num_jobs,
self.spec.variants["compile_type"].value, self.spec.variants["compile_type"].value,
output=str,
error=str
) )
if "Executables successfully built" in result_buf: if "Executables successfully built" in result_buf: