Update package to use MPI compile wrappers as specified in MPI package. (#1985)
+ Previouly, these strings were hard coded to 'mpicc', 'mpic++', and 'mpifort'.
This commit is contained in:
parent
c2ca8693e9
commit
29fc9cd22c
1 changed files with 4 additions and 6 deletions
|
@ -121,16 +121,14 @@ def install(self, spec, prefix):
|
|||
# this is not actually a problem.
|
||||
extra_args.extend([
|
||||
"--enable-parallel",
|
||||
"CC=%s" % join_path(spec['mpi'].prefix.bin, "mpicc"),
|
||||
"CC=%s" % spec['mpi'].mpicc
|
||||
])
|
||||
|
||||
if '+cxx' in spec:
|
||||
extra_args.append("CXX=%s" % join_path(spec['mpi'].prefix.bin,
|
||||
"mpic++"))
|
||||
extra_args.append("CXX=%s" % spec['mpi'].mpicxx)
|
||||
|
||||
if '+fortran' in spec:
|
||||
extra_args.append("FC=%s" % join_path(spec['mpi'].prefix.bin,
|
||||
"mpifort"))
|
||||
extra_args.append("FC=%s" % spec['mpi'].mpifc)
|
||||
|
||||
if '+szip' in spec:
|
||||
extra_args.append("--with-szlib=%s" % spec['szip'].prefix)
|
||||
|
@ -173,7 +171,7 @@ def check_install(self, spec):
|
|||
with open("check.c", 'w') as f:
|
||||
f.write(source)
|
||||
if '+mpi' in spec:
|
||||
cc = which(join_path(spec['mpi'].prefix.bin, "mpicc"))
|
||||
cc = which('%s' % spec['mpi'].mpicc)
|
||||
else:
|
||||
cc = which('cc')
|
||||
# TODO: Automate these path and library settings
|
||||
|
|
Loading…
Reference in a new issue