From 1c204bef8ad29b565325b20ee6d9d5a2b6548ff3 Mon Sep 17 00:00:00 2001 From: lukebroskop Date: Sun, 8 Aug 2021 09:16:57 -0500 Subject: 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 --- var/spack/repos/builtin/packages/trilinos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') 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" -- cgit v1.2.3-70-g09d2