diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2017-03-18 21:14:47 -0400 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-03-18 20:14:47 -0500 |
| commit | a0ab3c2523d0d209803f2126ae218783d1dc93e6 (patch) | |
| tree | 8c7b85faf19d9f63270eee0479993292350ed91d /var | |
| parent | 4866b4592fedab14890e9173e86f1300a1bad933 (diff) | |
| download | spack-a0ab3c2523d0d209803f2126ae218783d1dc93e6.tar.gz spack-a0ab3c2523d0d209803f2126ae218783d1dc93e6.tar.bz2 spack-a0ab3c2523d0d209803f2126ae218783d1dc93e6.tar.xz spack-a0ab3c2523d0d209803f2126ae218783d1dc93e6.zip | |
hdf5: Clean up building self-tests (#3483)
* hdf5: Clean up building self-tests
* hdf5: Clean up running self-tests
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 3b646f825c..15139db645 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -196,16 +196,12 @@ HDF5 version {version} {version} with open("check.c", 'w') as f: f.write(source) if '+mpi' in spec: - cc = which('%s' % spec['mpi'].mpicc) + cc = Executable(spec['mpi'].mpicc) else: - cc = which('cc') - # TODO: Automate these path and library settings - cc('-c', "-I%s" % join_path(spec.prefix, "include"), "check.c") - cc('-o', "check", "check.o", - "-L%s" % join_path(spec.prefix, "lib"), - "-L%s" % join_path(spec.prefix, "lib64"), - "-lhdf5", - "-lz") + cc = Executable(self.compiler.cc) + cc(*(['-c', "check.c"] + spec['hdf5'].cppflags.split())) + cc(*(['-o', "check", "check.o"] + + spec['hdf5'].libs.ld_flags.split())) try: check = Executable('./check') output = check(return_output=True) |