zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

detatch binutils usage from bootstrap in gcc variants (#18116)

Browse Source
This commit is contained in:
Marc Mengel 2020-08-20 10:06:22 -05:00 committed by GitHub
parent 286c3d6cbc
commit d5c3b876e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/gcc/package.py
View File

@ -95,6 +95,9 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
variant('nvptx', variant('nvptx',
default=False, default=False,
description='Target nvptx offloading to NVIDIA GPUs') description='Target nvptx offloading to NVIDIA GPUs')
variant('bootstrap',
default=False,
description='add --enable-bootstrap flag for stage3 build')
depends_on('flex', type='build', when='@master') depends_on('flex', type='build', when='@master')
@ -468,11 +471,15 @@ def configure_args(self):
if spec.satisfies('+binutils'): if spec.satisfies('+binutils'):
binutils = spec['binutils'].prefix.bin binutils = spec['binutils'].prefix.bin
options.extend([ options.extend([
'--with-sysroot=/',
'--with-gnu-ld', '--with-gnu-ld',
'--with-ld=' + binutils.ld, '--with-ld=' + binutils.ld,
'--with-gnu-as', '--with-gnu-as',
'--with-as=' + binutils.join('as'), '--with-as=' + binutils.join('as'),
])
# enable_bootstrap
if spec.satisfies('+bootstrap'):
options.extend([
'--enable-bootstrap', '--enable-bootstrap',
]) ])