[bug#63393] [PATCH V2 1/2] gnu: gcc-toolchain: Do not use gcc-final.

[John Kehayias via Guix-patches via <guix-patches@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gcc-toolchain-Do-not-use-gcc-final.patch --]
[-- Type: text/x-patch; name=0001-gnu-gcc-toolchain-Do-not-use-gcc-final.patch, Size: 1952 bytes --]

From d12383158b58d558ea98a61ea99f17b991c4231b Mon Sep 17 00:00:00 2001
Message-ID: <d12383158b58d558ea98a61ea99f17b991c4231b.1712171604.git.john.kehayias@protonmail.com>
From: Simon Tournier <zimon.toutoune@gmail.com>
Date: Tue, 9 May 2023 19:04:04 +0200
Subject: [PATCH 1/2] gnu: gcc-toolchain: Do not use gcc-final.

* gnu/packages/commencement.scm (gcc-toolchain): Bind to the default
gcc-toolchain-11 being consitent with others.
(gcc-toolchain-11): Make it from gcc-11.
(gcc-toolchain-aka-gcc): Bind to gcc-toolchain.
---
 gnu/packages/commencement.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9124f0e2e0..390bdad250 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3616,8 +3616,6 @@ (define* (make-gcc-toolchain gcc
                 ("libc-debug" ,libc "debug")
                 ("libc-static" ,libc "static"))))))
 
-(define-public gcc-toolchain
-  (make-gcc-toolchain gcc-final))
 
 (define-public gcc-toolchain-4.8
   (make-gcc-toolchain gcc-4.8))
@@ -3644,7 +3642,7 @@ (define-public gcc-toolchain-10
   (make-gcc-toolchain gcc-10))
 
 (define-public gcc-toolchain-11
-  gcc-toolchain)
+    (make-gcc-toolchain gcc-11))
 
 (define-public gcc-toolchain-12
   (make-gcc-toolchain gcc-12))
@@ -3652,10 +3650,14 @@ (define-public gcc-toolchain-12
 (define-public gcc-toolchain-13
   (make-gcc-toolchain gcc-13))
 
+;; The default GCC
+(define-public gcc-toolchain
+  gcc-toolchain-11)
+
 (define-public gcc-toolchain-aka-gcc
   ;; It's natural for users to try "guix install gcc".  This package
   ;; automatically "redirects" them to 'gcc-toolchain'.
-  (deprecated-package "gcc" gcc-toolchain-11))
+  (deprecated-package "gcc" gcc-toolchain))
 
 
 (define-public gdc-toolchain-10

base-commit: c9cd16c630ccba655b93ff32fd9a99570b4f5373
-- 
2.41.0