From 4a50e35262e9d8ce3a3c67d331cdd1460cd06a9a Mon Sep 17 00:00:00 2001 From: lukebroskop Date: Tue, 11 May 2021 17:25:50 -0500 Subject: CrayPE patch for conduit (#23516) Pass -ef to the CCE Fortran compiler --- var/spack/repos/builtin/packages/conduit/package.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'var') 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)) -- cgit v1.2.3-60-g2f50