diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2017-11-01 10:29:59 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2017-11-01 10:29:59 +0200 |
commit | 19b7bba1b5f115168b1669325cd51bc66b9dc4b4 (patch) | |
tree | 7b4e77080fe6fbc3a54b8612adc3c5c27ab81d05 /gnu/packages/commencement.scm | |
parent | f37931d6632627a24e4eccafa1603ffadb649ff6 (diff) | |
parent | 5010d0e36452882eb95666467bb983efa8cca081 (diff) | |
download | guix-19b7bba1b5f115168b1669325cd51bc66b9dc4b4.tar guix-19b7bba1b5f115168b1669325cd51bc66b9dc4b4.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/commencement.scm')
-rw-r--r-- | gnu/packages/commencement.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 93199d210d..f3afb28e18 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -967,7 +967,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") @@ -1013,18 +1013,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 |