diff options
| author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2015-10-23 10:11:38 +0200 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2015-10-23 10:11:38 +0200 |
| commit | e812c35689c4bc202ee33a14ac7680d87746e34a (patch) | |
| tree | f8d9dc7e2fd4c01751bd3a17a95fcfb3311c3824 /var | |
| parent | e6a44bd8ac40bfb93e51a99d3bfde476937207e1 (diff) | |
| download | spack-e812c35689c4bc202ee33a14ac7680d87746e34a.tar.gz spack-e812c35689c4bc202ee33a14ac7680d87746e34a.tar.bz2 spack-e812c35689c4bc202ee33a14ac7680d87746e34a.tar.xz spack-e812c35689c4bc202ee33a14ac7680d87746e34a.zip | |
GCC : removed binutils variant
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/gcc/package.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/var/spack/packages/gcc/package.py b/var/spack/packages/gcc/package.py index 4088b9f9d4..a49a1348aa 100644 --- a/var/spack/packages/gcc/package.py +++ b/var/spack/packages/gcc/package.py @@ -48,12 +48,10 @@ class Gcc(Package): version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4') version('4.5.4', '27e459c2566b8209ab064570e1b378f7') - variant('binutils', default=False, description='Add a dependency on binutils') - depends_on("mpfr") depends_on("gmp") depends_on("mpc") # when @4.5: - depends_on("binutils~libiberty", when="+binutils") + depends_on("binutils~libiberty") # Save these until we can do optional deps. depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE) @@ -81,13 +79,11 @@ class Gcc(Package): "--with-gnu-as", "--with-quad"] # Binutils - if '+binutils' in spec: - binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args, - "--with-boot-ldflags=%s" % self.rpath_args, - "--with-ld=%s/bin/ld" % spec['binutils'].prefix, - "--with-as=%s/bin/as" % spec['binutils'].prefix] - options.extend(binutils_options) - + binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args, + "--with-boot-ldflags=%s" % self.rpath_args, + "--with-ld=%s/bin/ld" % spec['binutils'].prefix, + "--with-as=%s/bin/as" % spec['binutils'].prefix] + options.extend(binutils_options) # Isl if spec.satisfies(Gcc.DEPENDS_ON_ISL_PREDICATE): isl_options = ["--with-isl=%s" % spec['isl'].prefix] |