From 073330e89347d236713abb123edaf0577a75ca84 Mon Sep 17 00:00:00 2001 From: "David M. Rogers" Date: Sun, 27 Mar 2022 13:50:53 -0400 Subject: h5z-zfp: fix build when ^hdf5+mpi (#29733) --- var/spack/repos/builtin/packages/h5z-zfp/package.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index 62f1b90ba9..70820a629b 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -23,6 +23,7 @@ class H5zZfp(MakefilePackage): depends_on('hdf5+fortran', when='+fortran') depends_on('hdf5', when='~fortran') + depends_on('mpi', when='^hdf5+mpi') depends_on('zfp bsws=8') patch('https://github.com/LLNL/H5Z-ZFP/commit/983a1870cefff5fdb643898a14eda855c2c231e4.patch?full_index=1', @@ -34,14 +35,19 @@ class H5zZfp(MakefilePackage): @property def make_defs(self): + cc = spack_cc + fc = spack_fc + if '^hdf5+mpi' in self.spec: + cc = self.spec['mpi'].mpicc + fc = self.spec['mpi'].mpifc make_defs = [ 'PREFIX=%s' % prefix, - 'CC=%s' % spack_cc, + 'CC=%s' % cc, 'HDF5_HOME=%s' % self.spec['hdf5'].prefix, 'ZFP_HOME=%s' % self.spec['zfp'].prefix] - if '+fortran' in self.spec and spack_fc: - make_defs += ['FC=%s' % spack_fc] + if '+fortran' in self.spec and fc: + make_defs += ['FC=%s' % fc] else: make_defs += ['FC='] -- cgit v1.2.3-70-g09d2