diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-14 14:40:25 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-14 14:40:25 -0800 |
| commit | d8c0edcc818b8f0fb2220993d469381ae072ebe4 (patch) | |
| tree | bd8245da4571c8f6792ae54ea170f0e9d2a6152a /var | |
| parent | 63911d416557c2c686d357c001d6ad3feebc5a8f (diff) | |
| download | spack-d8c0edcc818b8f0fb2220993d469381ae072ebe4.tar.gz spack-d8c0edcc818b8f0fb2220993d469381ae072ebe4.tar.bz2 spack-d8c0edcc818b8f0fb2220993d469381ae072ebe4.tar.xz spack-d8c0edcc818b8f0fb2220993d469381ae072ebe4.zip | |
Minor code cleanup for gcc.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gcc/package.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 3e5895cfb8..f8958ee290 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -36,8 +36,6 @@ class Gcc(Package): list_url = 'http://open-source-box.org/gcc/' list_depth = 2 - DEPENDS_ON_ISL_PREDICATE = '@5.0:' - version('5.3.0', 'c9616fd448f980259c31de613e575719') version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467') version('4.9.3', '6f831b4d251872736e8e9cc09746f327') @@ -53,12 +51,11 @@ class Gcc(Package): depends_on("mpfr") 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+gold", when='+gold') - # Save these until we can do optional deps. - depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE) #depends_on("ppl") #depends_on("cloog") @@ -91,7 +88,7 @@ class Gcc(Package): "--with-as=%s/bin/as" % spec['binutils'].prefix] options.extend(binutils_options) # Isl - if spec.satisfies(Gcc.DEPENDS_ON_ISL_PREDICATE): + if 'isl' in spec: isl_options = ["--with-isl=%s" % spec['isl'].prefix] options.extend(isl_options) |