01/03: gnu: gcc: Add unversioned 'gcc-toolchain' variable.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit b887ede17d6ce520d5f500c39dce98cd8fc4a8a2
Author: Ludovic Courtès <address@hidden>
Date:   Fri Oct 27 12:35:49 2017 -0700

    gnu: gcc: Add unversioned 'gcc-toolchain' variable.
    
    Reported by Theodoros Foradis <address@hidden>.
    
    * gnu/packages/commencement.scm (gcc-toolchain): Rename to...
    (make-gcc-toolchain): ... this.
    (gcc-toolchain): New variable.
    (gcc-toolchain-5): Turn into an alias for 'gcc-toolchain'.
---
 gnu/packages/commencement.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ec76778..406a23b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -959,7 +959,7 @@ COREUTILS-FINAL vs. COREUTILS, etc."
 ;;; GCC toolchain.
 ;;;
 
-(define (gcc-toolchain gcc)
+(define (make-gcc-toolchain gcc)
   "Return a complete toolchain for GCC."
   (package
     (name "gcc-toolchain")
@@ -1005,18 +1005,21 @@ and binaries, plus debugging symbols in the 'debug' 
output), and Binutils.")
               ("libc-debug" ,glibc-final "debug")))))
 
 (define-public gcc-toolchain-4.8
-  (gcc-toolchain gcc-4.8))
+  (make-gcc-toolchain gcc-4.8))
 
 (define-public gcc-toolchain-4.9
-  (gcc-toolchain gcc-4.9))
+  (make-gcc-toolchain gcc-4.9))
+
+(define-public gcc-toolchain
+  (make-gcc-toolchain gcc-final))
 
 (define-public gcc-toolchain-5
-  (gcc-toolchain gcc-final))
+  gcc-toolchain)
 
 (define-public gcc-toolchain-6
-  (gcc-toolchain gcc-6))
+  (make-gcc-toolchain gcc-6))
 
 (define-public gcc-toolchain-7
-  (gcc-toolchain gcc-7))
+  (make-gcc-toolchain gcc-7))
 
 ;;; commencement.scm ends here