guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

18/18: DRAFT gnu: gcc: Update gcc, gcc-toolchain to 14.


From: guix-commits
Subject: 18/18: DRAFT gnu: gcc: Update gcc, gcc-toolchain to 14.
Date: Thu, 5 Dec 2024 14:45:42 -0500 (EST)

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

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

    DRAFT gnu: gcc: Update gcc, gcc-toolchain 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.
    * gnu/packages/commencement.scm (gcc-toolchain): Define as gcc-toolchain-14
    for all.
    
    Change-Id: Iaac983da8acbbb2fd1088a0469d6115b7d424dbb
---
 gnu/packages/commencement.scm | 6 ++----
 gnu/packages/gcc.scm          | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d81fbaf1df..9b2c1c5dd5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3702,7 +3702,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))
@@ -3715,9 +3715,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 86f7a7df35..ac9c6fb6b8 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -858,10 +858,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)
 
 
 ;;;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]