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

[guix-commits]

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

commit 4fbc7f2818084c34b834bdaa06a5227c31964007
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Nov 21 13:04:34 2024 +0100

    squash! gnu: commencement: gcc-final: Support gcc-14 and the 64bit Hurd.
    
    * Use target-hurd64? instead of (version>=? (package-version gcc) "14") XXX*
    Use CFLAGS, CXXFLAGS instead of overriding CC, CXX.  Add CFLAGS_FOR_TARGET.
    
    Change-Id: I122cf72197cfb2c487118f45ab34b657a75ada84
---
 gnu/packages/commencement.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5df8a820f8..68c57b17ca 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3263,18 +3263,22 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker 
-Wl,~a/~a \"$@\"~%"
                         flag))
                   #$flags)))
         ((#:configure-flags flags)
-         (if (version>=? (package-version gcc) "14")
-             ;;Convince gmp's configure that gcc works
+         (if (target-hurd64?)
              #~(append
                 (list #$(string-append
-                         "CC=gcc"
+                         ;;Convince gmp's configure that gcc works
+                         "CFLAGS==-g -O2"
                          " -Wno-implicit-function-declaration")
                       ;; XXX Why would this be necessary,
                       ;; #$libstdc++/lib is in LIBRARY_PATH!?
                       (string-append
-                       "CXX=g++"
+                       "CXXFLAGS==-g -O2"
                        " -L " #$libstdc++ "/lib64" ;FIXME REMOVEME
-                       " -L " #$libstdc++ "/lib"))
+                       " -L " #$libstdc++ "/lib")
+                      #$(string-append
+                         ;;Convince gmp's configure that gcc works
+                         "CFLAGS_FOR_TARGET==-g -O2"
+                         " -Wno-implicit-function-declaration"))
                 #$flags)
              flags))
         ;; Build again GMP & co. within GCC's build process, because it's hard