02/03: squash! gnu: commencement: gcc-boot0: Support gcc-14 and the 64bit Hurd.

[guix-commits]

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

commit 3ba0c6e53e63801a58758563d214b555e0239a1c
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Nov 21 14:00:29 2024 +0100

    squash! gnu: commencement: gcc-boot0: Support gcc-14 and the 64bit Hurd.
    
    * Use target-hurd64? instead of (version>=? (package-version gcc) "14")
    * Use CFLAGS_FOR_BUILD instead of CC_FOR_BUILD
    
    Change-Id: I122cf72197cfb2c487118f45ab34b657a75ada84
---
 gnu/packages/commencement.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a5ee213b5d..5df8a820f8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2400,10 +2400,11 @@ exec " gcc "/bin/" program
                                      (match (%current-system)
                                        ("x86_64-linux" "i686-linux")
                                        (_ (%current-system))))))
-                  (if (version>=? (package-version gcc) "14")
+                  (if (target-hurd64?)
                       ;;Convince gmp's configure that gcc works
-                      (list (string-append "CC_FOR_BUILD=gcc"
-                                           " 
-Wno-implicit-function-declaration"))
+                      (list (string-append
+                             "CFLAGS_FOR_BUILD=-g -O2"
+                             " -Wno-implicit-function-declaration"))
                       '())))))
         ((#:phases phases)
          #~(modify-phases #$phases
@@ -2428,7 +2429,7 @@ exec " gcc "/bin/" program
                                            char-set:letter)
                                         #$(package-name lib)))
                            (list gmp-6.0 mpfr mpc)))))
-             #$@(if (version>=? (package-version gcc) "14")
+             #$@(if (target-hurd64?)
                     #~((add-after 'unpack 'patch-libcc1-static
                          (lambda _
                            ;;Attempting to build libcc1 shared gives: