209/216: DRAFT gnu: gcc: Update gcc, gcc-toolchain, libgccjit to 14.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit be2d9d534d12d24bb23fd03b1cb1b8f970890e0b
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 3 08:52:13 2024 +0100

    DRAFT gnu: gcc: Update gcc, gcc-toolchain, libgccjit to 14.
    
    We probably want to keep this patch "bubbling" up on top of the gcc-14 
patches
    until the gcc-14 transition is done, keeping every commit buildable.
    
    * gnu/packages/gcc.scm (gcc): Define as gcc-14 for all.
    (libgccjit): Define as libgccjit-14.
    * gnu/packages/commencement.scm (gcc-toolchain): Define as gcc-toolchain-14
    for all.
    * gnu/packages/gcc.scm
    
    Change-Id: Iaac983da8acbbb2fd1088a0469d6115b7d424dbb
---
 gnu/packages/commencement.scm | 6 ++----
 gnu/packages/gcc.scm          | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index e1c7082753..d9992a9086 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3675,7 +3675,7 @@ is the GNU Compiler Collection.")
   (make-gcc-toolchain gcc-10))
 
 (define-public gcc-toolchain-11
-    (make-gcc-toolchain gcc-11))
+  (make-gcc-toolchain gcc-11))
 
 (define-public gcc-toolchain-12
   (make-gcc-toolchain gcc-12))
@@ -3688,9 +3688,7 @@ is the GNU Compiler Collection.")
 
 ;; The default GCC
 (define-public gcc-toolchain
-  (if (host-hurd64?)
-      gcc-toolchain-14
-      gcc-toolchain-11))
+  gcc-toolchain-14)
 
 (define-public gcc-toolchain-aka-gcc
   ;; It's natural for users to try "guix install gcc".  This package
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index bd351e6150..a46551e152 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -885,10 +885,7 @@ It also includes runtime support libraries for these 
languages.")
 
 ;; Note: When changing the default gcc version, update
 ;;       the gcc-toolchain-* definitions.
-(define-public gcc
-  (if (host-hurd64?)
-      gcc-14
-      gcc-11))
+(define-public gcc gcc-14)
 
 
 ;;;
@@ -1290,7 +1287,7 @@ misnomer.")))
 
 ;; This must match the 'gcc' variable, but it must also be 'eq?' to one of the
 ;; libgccjit-* packages above.
-(define-public libgccjit libgccjit-11)
+(define-public libgccjit libgccjit-14)
 
 (define (make-gccgo gcc)
   "Return a gccgo package based on GCC."