Skip to content
Snippets Groups Projects
Commit 29fc9cd2 authored by Kelly (KT) Thompson's avatar Kelly (KT) Thompson Committed by Todd Gamblin
Browse files

Update package to use MPI compile wrappers as specified in MPI package. (#1985)

+ Previouly, these strings were hard coded to 'mpicc', 'mpic++', and 'mpifort'.
parent c2ca8693
Branches
Tags
No related merge requests found
...@@ -121,16 +121,14 @@ def install(self, spec, prefix): ...@@ -121,16 +121,14 @@ def install(self, spec, prefix):
# this is not actually a problem. # this is not actually a problem.
extra_args.extend([ extra_args.extend([
"--enable-parallel", "--enable-parallel",
"CC=%s" % join_path(spec['mpi'].prefix.bin, "mpicc"), "CC=%s" % spec['mpi'].mpicc
]) ])
if '+cxx' in spec: if '+cxx' in spec:
extra_args.append("CXX=%s" % join_path(spec['mpi'].prefix.bin, extra_args.append("CXX=%s" % spec['mpi'].mpicxx)
"mpic++"))
if '+fortran' in spec: if '+fortran' in spec:
extra_args.append("FC=%s" % join_path(spec['mpi'].prefix.bin, extra_args.append("FC=%s" % spec['mpi'].mpifc)
"mpifort"))
if '+szip' in spec: if '+szip' in spec:
extra_args.append("--with-szlib=%s" % spec['szip'].prefix) extra_args.append("--with-szlib=%s" % spec['szip'].prefix)
...@@ -173,7 +171,7 @@ def check_install(self, spec): ...@@ -173,7 +171,7 @@ def check_install(self, spec):
with open("check.c", 'w') as f: with open("check.c", 'w') as f:
f.write(source) f.write(source)
if '+mpi' in spec: if '+mpi' in spec:
cc = which(join_path(spec['mpi'].prefix.bin, "mpicc")) cc = which('%s' % spec['mpi'].mpicc)
else: else:
cc = which('cc') cc = which('cc')
# TODO: Automate these path and library settings # TODO: Automate these path and library settings
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment