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

GCC : removed binutils variant

Browse Source
This commit is contained in:
Massimiliano Culpo 2015-10-23 10:11:38 +02:00
parent e6a44bd8ac
commit e812c35689
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/packages/gcc/package.py
View File

@ -48,12 +48,10 @@ class Gcc(Package):
version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4') version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4')
version('4.5.4', '27e459c2566b8209ab064570e1b378f7') version('4.5.4', '27e459c2566b8209ab064570e1b378f7')
variant('binutils', default=False, description='Add a dependency on binutils')
depends_on("mpfr") depends_on("mpfr")
depends_on("gmp") depends_on("gmp")
depends_on("mpc") # when @4.5: depends_on("mpc") # when @4.5:
depends_on("binutils~libiberty", when="+binutils") depends_on("binutils~libiberty")
# Save these until we can do optional deps. # Save these until we can do optional deps.
depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE) depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE)
@ -81,13 +79,11 @@ def install(self, spec, prefix):
"--with-gnu-as", "--with-gnu-as",
"--with-quad"] "--with-quad"]
# Binutils # Binutils
if '+binutils' in spec:
binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args, binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args,
"--with-boot-ldflags=%s" % self.rpath_args, "--with-boot-ldflags=%s" % self.rpath_args,
"--with-ld=%s/bin/ld" % spec['binutils'].prefix, "--with-ld=%s/bin/ld" % spec['binutils'].prefix,
"--with-as=%s/bin/as" % spec['binutils'].prefix] "--with-as=%s/bin/as" % spec['binutils'].prefix]
options.extend(binutils_options) options.extend(binutils_options)
# Isl # Isl
if spec.satisfies(Gcc.DEPENDS_ON_ISL_PREDICATE): if spec.satisfies(Gcc.DEPENDS_ON_ISL_PREDICATE):
isl_options = ["--with-isl=%s" % spec['isl'].prefix] isl_options = ["--with-isl=%s" % spec['isl'].prefix]