summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorlukebroskop <luke.roskop@hpe.com>2021-05-17 11:23:24 -0500
committerGitHub <noreply@github.com>2021-05-17 09:23:24 -0700
commitb462ccb565c9c5c7eae31c8d067ea96e12da9842 (patch)
treed8fa7dc7def31b110eb5e894389b8c20f104745f /var
parent87466df80f97a7412f709517c2bc3b18e76bb169 (diff)
downloadspack-b462ccb565c9c5c7eae31c8d067ea96e12da9842.tar.gz
spack-b462ccb565c9c5c7eae31c8d067ea96e12da9842.tar.bz2
spack-b462ccb565c9c5c7eae31c8d067ea96e12da9842.tar.xz
spack-b462ccb565c9c5c7eae31c8d067ea96e12da9842.zip
CrayPE fix for trilinos (#23518)
Expand the use of cray_secas.patch and use the gold linker w/cce Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 0d6b469b1f..cc42c5eeaa 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -442,7 +442,13 @@ class Trilinos(CMakePackage, CudaPackage):
patch('xlf_tpetra.patch', when='@12.12.1%clang')
patch('fix_clang_errors_12_18_1.patch', when='@12.18.1%clang')
patch('cray_secas_12_12_1.patch', when='@12.12.1%cce')
- patch('cray_secas.patch', when='@12.14.1:12.18.1%cce')
+ patch('cray_secas.patch', when='@12.14.1:%cce')
+
+ def flag_handler(self, name, flags):
+ if self.spec.satisfies('%cce'):
+ if name == 'ldflags':
+ flags.append('-fuse-ld=gold')
+ return (None, None, flags)
# workaround an NVCC bug with c++14 (https://github.com/trilinos/Trilinos/issues/6954)
# avoid calling deprecated functions with CUDA-11