From de8027a820fb24354a06946eb3c6c05cc45ad3a5 Mon Sep 17 00:00:00 2001 From: lukebroskop Date: Mon, 17 May 2021 11:26:15 -0500 Subject: CrayPE fix for binutils (#23500) Allow for multiple definitions at link time (for CrayPE) Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> Co-authored-by: Harmen Stoppels --- var/spack/repos/builtin/packages/binutils/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 91c80f67c9..30a069fa70 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -73,6 +73,14 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): # --disable-ld flag conflicts('~ld', '+gold') + def setup_build_environment(self, env): + + if self.spec.satisfies('%cce'): + env.append_flags('LDFLAGS', '-Wl,-z,muldefs') + + if '+nls' in spec: + env.append_flags('LDFLAGS', '-lintl') + def configure_args(self): spec = self.spec @@ -101,7 +109,6 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): if '+nls' in spec: args.append('--enable-nls') - args.append('LDFLAGS=-lintl') else: args.append('--disable-nls') -- cgit v1.2.3-70-g09d2