01/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 587cd1bc742ec19fcd2f4f86fac88f897c8640b1
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Nov 21 00:38:19 2024 +0100

    squash! gnu: commencement: gcc-final: Support gcc-14 and the 64bit Hurd.:
    
    Set CC and CXX in #:configure-flags instead of _FOR_BUILD variants in 
#:make-flags
    
    Change-Id: I14f863b18a3663ee2030ffd47f19adb7f45faa6b
---
 gnu/packages/commencement.scm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 836e9cad09..a5ee213b5d 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3260,15 +3260,22 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker 
-Wl,~a/~a \"$@\"~%"
                                        "/lib -L" zlib "/lib -Wl,-rpath="
                                        zlib "/lib")
                         flag))
-                  #$(append
-                     flags
-                     (if (version>=? (package-version gcc) "14")
-                         ;;Convince gmp's configure that gcc works
-                         `((list
-                            ,(string-append
-                              "CC_FOR_BUILD=gcc"
-                              " -Wno-implicit-function-declaration")))
-                         '())))))
+                  #$flags)))
+        ((#:configure-flags flags)
+         (if (version>=? (package-version gcc) "14")
+             ;;Convince gmp's configure that gcc works
+             #~(append
+                (list #$(string-append
+                         "CC=gcc"
+                         " -Wno-implicit-function-declaration")
+                      ;; XXX Why would this be necessary,
+                      ;; #$libstdc++/lib is in LIBRARY_PATH!?
+                      (string-append
+                       "CXX=g++"
+                       " -L " #$libstdc++ "/lib64" ;FIXME REMOVEME
+                       " -L " #$libstdc++ "/lib"))
+                #$flags)
+             flags))
         ;; Build again GMP & co. within GCC's build process, because it's hard
         ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus
         ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)