CrayPE patch for conduit (#23516)

Pass -ef to the CCE Fortran compiler
This commit is contained in:
lukebroskop 2021-05-11 17:25:50 -05:00 committed by GitHub
parent 5230730941
commit 4a50e35262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -164,12 +164,6 @@ class Conduit(CMakePackage):
################################### ###################################
phases = ['hostconfig', 'cmake', 'build', 'install'] 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): def setup_build_environment(self, env):
env.set('CTEST_OUTPUT_ON_FAILURE', '1') env.set('CTEST_OUTPUT_ON_FAILURE', '1')
@ -354,6 +348,8 @@ def hostconfig(self, spec, prefix):
if cxxflags: if cxxflags:
cfg.write(cmake_cache_entry("CMAKE_CXX_FLAGS", cxxflags)) cfg.write(cmake_cache_entry("CMAKE_CXX_FLAGS", cxxflags))
fflags = ' '.join(spec.compiler_flags['fflags']) fflags = ' '.join(spec.compiler_flags['fflags'])
if self.spec.satisfies('%cce'):
fflags += " -ef"
if fflags: if fflags:
cfg.write(cmake_cache_entry("CMAKE_Fortran_FLAGS", fflags)) cfg.write(cmake_cache_entry("CMAKE_Fortran_FLAGS", fflags))