hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor code cleanup for gcc.

Browse source
This commit is contained in:
Todd Gamblin 2016-02-14 14:40:25 -08:00
parent 63911d4165
commit d8c0edcc81
1 changed files with 3 additions and 6 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

@ -36,8 +36,6 @@ class Gcc(Package):
list_url = 'http://open-source-box.org/gcc/' list_url = 'http://open-source-box.org/gcc/'
list_depth = 2 list_depth = 2
DEPENDS_ON_ISL_PREDICATE = '@5.0:'
version('5.3.0', 'c9616fd448f980259c31de613e575719') version('5.3.0', 'c9616fd448f980259c31de613e575719')
version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467') version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467')
version('4.9.3', '6f831b4d251872736e8e9cc09746f327') version('4.9.3', '6f831b4d251872736e8e9cc09746f327')
@ -53,12 +51,11 @@ class Gcc(Package):
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("isl", when='@5.0:')
depends_on("binutils~libiberty", when='~gold') depends_on("binutils~libiberty", when='~gold')
depends_on("binutils~libiberty+gold", when='+gold') depends_on("binutils~libiberty+gold", when='+gold')
# Save these until we can do optional deps.
depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE)
#depends_on("ppl") #depends_on("ppl")
#depends_on("cloog") #depends_on("cloog")
@ -91,7 +88,7 @@ def install(self, spec, 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 'isl' in spec:
isl_options = ["--with-isl=%s" % spec['isl'].prefix] isl_options = ["--with-isl=%s" % spec['isl'].prefix]
options.extend(isl_options) options.extend(isl_options)