diff options
| author | Chris White <white238@llnl.gov> | 2021-04-28 12:11:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 12:11:19 -0700 |
| commit | c8084991b4b0b882482cc28b6f46fcf20707fe7b (patch) | |
| tree | eb3d4755ed908531ae30d61415afbb40a36c09df | |
| parent | 51509dbad0a11abc9ef668123e696ed40017d833 (diff) | |
| download | spack-c8084991b4b0b882482cc28b6f46fcf20707fe7b.tar.gz spack-c8084991b4b0b882482cc28b6f46fcf20707fe7b.tar.bz2 spack-c8084991b4b0b882482cc28b6f46fcf20707fe7b.tar.xz spack-c8084991b4b0b882482cc28b6f46fcf20707fe7b.zip | |
Honor global compiler flags (#23305)
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 90022c81fb..d4c8b916ac 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -299,13 +299,22 @@ class Hdf5(AutotoolsPackage): extra_args.append('--enable-static-exec') if '+pic' in self.spec: - extra_args.extend([ - 'CFLAGS=' + self.compiler.cc_pic_flag, - 'CXXFLAGS=' + self.compiler.cxx_pic_flag, - 'FCFLAGS=' + self.compiler.fc_pic_flag, - ]) + # use global spack compiler flags + _flags = self.compiler.cc_pic_flag + _flags += " " + ' '.join(self.spec.compiler_flags['cflags']) + extra_args.append('CFLAGS={0}'.format(_flags)) - # Fujitsu Compiler dose not add Fortran runtime in rpath. + if '+cxx' in self.spec: + _flags = self.compiler.cxx_pic_flag + _flags += " " + ' '.join(self.spec.compiler_flags['cxxflags']) + extra_args.append('CXXFLAGS={0}'.format(_flags)) + + if '+fortran' in self.spec: + _flags = self.compiler.fc_pic_flag + _flags += " " + ' '.join(self.spec.compiler_flags['fflags']) + extra_args.append('FCFLAGS={0}'.format(_flags)) + + # Fujitsu Compiler does not add Fortran runtime in rpath. if '+fortran %fj' in self.spec: extra_args.append('LDFLAGS=-lfj90i -lfj90f -lfjsrcinfo -lelf') |