diff options
| author | lukebroskop <luke.roskop@hpe.com> | 2021-05-11 17:25:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 15:25:50 -0700 |
| commit | 4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a (patch) | |
| tree | 10269ba299fce5f92e030ebff48deac0598deb44 | |
| parent | 52307309410bf2f076df78f40ca3aa762b8897fc (diff) | |
| download | spack-4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a.tar.gz spack-4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a.tar.bz2 spack-4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a.tar.xz spack-4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a.zip | |
CrayPE patch for conduit (#23516)
Pass -ef to the CCE Fortran compiler
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 00bfff4cac..2f14836cfd 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -164,12 +164,6 @@ class Conduit(CMakePackage): ################################### phases = ['hostconfig', 'cmake', 'build', 'install'] - def flag_handler(self, name, flags): - if name in ('cflags', 'cxxflags', 'fflags'): - # the package manages these flags in another way - return (None, None, None) - return (flags, None, None) - def setup_build_environment(self, env): env.set('CTEST_OUTPUT_ON_FAILURE', '1') @@ -354,6 +348,8 @@ class Conduit(CMakePackage): if cxxflags: cfg.write(cmake_cache_entry("CMAKE_CXX_FLAGS", cxxflags)) fflags = ' '.join(spec.compiler_flags['fflags']) + if self.spec.satisfies('%cce'): + fflags += " -ef" if fflags: cfg.write(cmake_cache_entry("CMAKE_Fortran_FLAGS", fflags)) |