~ruther/guix-local: gnu: Fix definitions of gcc-toolchain-4.8 and gcc-toolchain-4.9.

ce362de86ee79757a98a1438c815fd79a50129a5 — Mark H Weaver 10 years ago 092dd65

gnu: Fix definitions of gcc-toolchain-4.8 and gcc-toolchain-4.9.

* gnu/packages/commencement.scm (gcc-toolchain-4.8): Use gcc-4.8,
not gcc-final.
(gcc-toolchain-4.9): Use gcc-final, not gcc-4.9.
* gnu/packages/gcc.scm (gcc): Add reminder comment for the future.

patch browse .tar.gz

2 files changed, 4 insertions(+), 2 deletions(-)

M gnu/packages/commencement.scm
M gnu/packages/gcc.scm

M gnu/packages/commencement.scm => gnu/packages/commencement.scm +2 -2

@@ 871,10 871,10 @@ 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-final))
+  (gcc-toolchain gcc-4.8))
 
 (define-public gcc-toolchain-4.9
-  (gcc-toolchain gcc-4.9))
+  (gcc-toolchain gcc-final))
 
 (define-public gcc-toolchain-5
   (gcc-toolchain gcc-5))

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +2 -0

@@ 354,6 354,8 @@ Go.  It also includes runtime support libraries for these languages.")
                 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"))
               (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch")))))))
 
+;; Note: When changing the default gcc version, update
+;;       the gcc-toolchain-* definitions accordingly.
 (define-public gcc gcc-4.9)
 
 (define-public (make-libstdc++ gcc)