summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorlukebroskop <luke.roskop@hpe.com>2021-08-08 09:16:57 -0500
committerGitHub <noreply@github.com>2021-08-08 10:16:57 -0400
commit1c204bef8ad29b565325b20ee6d9d5a2b6548ff3 (patch)
treebe9935148cec78df84d557fe9db65cee8769f1e6 /var
parent9b66053d9917b322112b3efb86a8208570188ff9 (diff)
downloadspack-1c204bef8ad29b565325b20ee6d9d5a2b6548ff3.tar.gz
spack-1c204bef8ad29b565325b20ee6d9d5a2b6548ff3.tar.bz2
spack-1c204bef8ad29b565325b20ee6d9d5a2b6548ff3.tar.xz
spack-1c204bef8ad29b565325b20ee6d9d5a2b6548ff3.zip
trilinos: flag_handler logic fix (#25290)
* Do not allow cray build system patch for later version of otf2 * Modify flag_handler logic in the trilinos package Modify flag_handler logic in the trilinos package to work better with compilers other than CCE
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index ec16906cc1..afab660794 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -440,7 +440,8 @@ class Trilinos(CMakePackage, CudaPackage):
if self.spec.satisfies('%cce'):
if name == 'ldflags':
flags.append('-fuse-ld=gold')
- return (None, None, flags)
+ return (None, None, flags)
+ return (flags, None, None)
def url_for_version(self, version):
url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz"