diff options
| author | Kelly Thompson <KineticTheory@users.noreply.github.com> | 2016-10-10 16:33:00 -0600 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-10-10 15:33:00 -0700 |
| commit | 29fc9cd22c4d4cf600ec5982f2f43c9941539e7f (patch) | |
| tree | 7fb252e4869999710259be029d3e605e89760dd7 | |
| parent | c2ca8693e9c706fac7709e06ec40e04bd8d2efa1 (diff) | |
| download | spack-29fc9cd22c4d4cf600ec5982f2f43c9941539e7f.tar.gz spack-29fc9cd22c4d4cf600ec5982f2f43c9941539e7f.tar.bz2 spack-29fc9cd22c4d4cf600ec5982f2f43c9941539e7f.tar.xz spack-29fc9cd22c4d4cf600ec5982f2f43c9941539e7f.zip | |
Update package to use MPI compile wrappers as specified in MPI package. (#1985)
+ Previouly, these strings were hard coded to 'mpicc', 'mpic++', and 'mpifort'.
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 5984e50f42..c0635cfbfc 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -121,16 +121,14 @@ class Hdf5(Package): # 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 @@ HDF5 version {version} {version} 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 |