summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcedricchevalier19 <cedric.chevalier@cea.fr>2020-07-06 20:02:35 +0200
committerGitHub <noreply@github.com>2020-07-06 13:02:35 -0500
commitf0275d7e1b31b27c584c17eaf77d1495c2cd222e (patch)
tree40502a98f5f889a08df577ace033e3971662fd7d
parent516c3e659f3af89912edeb5209a1d1584c345545 (diff)
downloadspack-f0275d7e1b31b27c584c17eaf77d1495c2cd222e.tar.gz
spack-f0275d7e1b31b27c584c17eaf77d1495c2cd222e.tar.bz2
spack-f0275d7e1b31b27c584c17eaf77d1495c2cd222e.tar.xz
spack-f0275d7e1b31b27c584c17eaf77d1495c2cd222e.zip
Fix gcc + binutils compilation. (#9024)
* fix binutils deptype for gcc binutils needs to be a run dependency of gcc * Fix gcc+binutils build on RHEL7+ static-libstdc++ is not available with system gcc. Anyway, as it is for bootstraping, we do not really care depending on a shared libstdc++. Co-authored-by: Michael Kuhn <michael@ikkoku.de>
-rw-r--r--var/spack/repos/builtin/packages/gcc/package.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 4c822b1198..3072402dab 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -115,7 +115,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
depends_on('zstd', when='@10:')
depends_on('iconv', when='platform=darwin')
depends_on('gnat', when='languages=ada')
- depends_on('binutils~libiberty', when='+binutils')
+ depends_on('binutils~libiberty', when='+binutils', type=('build', 'link', 'run'))
depends_on('zip', type='build', when='languages=java')
depends_on('cuda', when='+nvptx')
@@ -373,8 +373,6 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
# enable appropriate bootstrapping flags
stage1_ldflags = str(self.rpath_args)
boot_ldflags = stage1_ldflags + ' -static-libstdc++ -static-libgcc'
- if '%gcc' in spec:
- stage1_ldflags = boot_ldflags
options.append('--with-stage1-ldflags=' + stage1_ldflags)
options.append('--with-boot-ldflags=' + boot_ldflags)