summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-12-03 08:52:13 +0100
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:26 +0200
commit84f665f8d1cad5d8bc6013f5cc8ba8f12578c494 (patch)
tree3e0d5f9fcaffd313d9b922e88a0404bfe8603521
parent023a13cb3d08007266f6f53a4f1a844b357a7495 (diff)
gnu: gcc: Update gcc, gcc-toolchain, libgccjit to 14.
* 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
-rw-r--r--gnu/packages/commencement.scm6
-rw-r--r--gnu/packages/gcc.scm7
2 files changed, 4 insertions, 9 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d63e812e64..607830f087 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))
@@ -3691,9 +3691,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 0c9e7b2dee..89d0368887 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -933,10 +933,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)
;;;
@@ -1343,7 +1340,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."