summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorbecker33 <becker33@llnl.gov>2017-05-24 17:13:18 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2017-05-24 17:13:18 -0700
commit12ab882eba1631f85f4ebd2acfe1a9c41857ca79 (patch)
tree096d0e928d929fec69fe89ce85fc948e0bb84e9e /var
parentc1cea7ebcfdcb2573439c8185dae35ce5e55c43f (diff)
downloadspack-12ab882eba1631f85f4ebd2acfe1a9c41857ca79.tar.gz
spack-12ab882eba1631f85f4ebd2acfe1a9c41857ca79.tar.bz2
spack-12ab882eba1631f85f4ebd2acfe1a9c41857ca79.tar.xz
spack-12ab882eba1631f85f4ebd2acfe1a9c41857ca79.zip
Fix issues parsing multiple anonymous specs (#4199)
* fix parser * Removed xfails * cleaned up debug print statements * make use of these changes in gcc * Added comment explaining unreachable line, line left for added protection
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gcc/package.py19
1 files changed, 8 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 1bdee43e83..3d42bb98b5 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -97,17 +97,14 @@ class Gcc(AutotoolsPackage):
# depends_on('guile@1.4.1:', type='test')
# See https://golang.org/doc/install/gccgo#Releases
- provides('golang', when='languages=go')
- # 'when' does not currently support multiple parts of a spec.
- # See https://github.com/LLNL/spack/pull/4151
- # provides('golang', when='languages=go @4.6:')
- # provides('golang@:1', when='languages=go @4.7.1:')
- # provides('golang@:1.1', when='languages=go @4.8:')
- # provides('golang@:1.1.2', when='languages=go @4.8.2:')
- # provides('golang@:1.2', when='languages=go @4.9:')
- # provides('golang@:1.4', when='languages=go @5:')
- # provides('golang@:1.6.1', when='languages=go @6:')
- # provides('golang@:1.8', when='languages=go @7:')
+ provides('golang', when='languages=go @4.6:')
+ provides('golang@:1', when='languages=go @4.7.1:')
+ provides('golang@:1.1', when='languages=go @4.8:')
+ provides('golang@:1.1.2', when='languages=go @4.8.2:')
+ provides('golang@:1.2', when='languages=go @4.9:')
+ provides('golang@:1.4', when='languages=go @5:')
+ provides('golang@:1.6.1', when='languages=go @6:')
+ provides('golang@:1.8', when='languages=go @7:')
# For a list of valid languages for a specific release,
# run the following command in the GCC source directory: