02/07: gnu: commencement: gcc-final: Fix build for x86_64-linux with gcc-14.

[guix-commits]

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

commit 0b9375e33c0f4edb7758d8c6e73e93b1f399ecd8
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 3 13:15:04 2024 +0100

    gnu: commencement: gcc-final: Fix build for x86_64-linux with gcc-14.
    
    Summary: Use fixes for the 64bit Hurd also on x86_64-linux.
    
    * gnu/packages/commencement.scm (gcc-final)[arguments]: When building for
    x86_64-linux, create a gcc wrapper in phase "create-stage-wrapper", use it 
by
    adding STAGE_CC_WRAPPER to #:make-flags, and CC to #:configure-flags to
    convince configure gmp that gcc and g++ work.
    
    Change-Id: I968adbea62afe55917610a4fa6568c80ddcab7ce
---
 gnu/packages/commencement.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5708714342..9b1af7bb03 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3273,7 +3273,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
                                        "/lib -L" zlib "/lib -Wl,-rpath="
                                        zlib "/lib")
                         flag))
-                  #$(if (target-hurd64?)
+                  #$(if (or (target-hurd64?)
+                            (and (target-x86-64?) (target-linux?)))
                         `(cons
                           (string-append
                            ;;Convince gmp's configure that gcc works
@@ -3281,7 +3282,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
                           ,flags)
                         flags))))
         ((#:configure-flags flags)
-         (if (target-hurd64?)
+         (if (or (target-hurd64?)
+                 (and (target-x86-64?) (target-linux?)))
              #~(append
                 #$flags
                 (list #$(string-append
@@ -3335,7 +3337,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
                                                #\:))
                                       ":")
                                      "\nAM_CXXFLAGS = "))))))
-             #$@(if (target-hurd64?)
+             #$@(if (or (target-hurd64?)
+                        (and (target-x86-64?) (target-linux?)))
                     #~((add-after 'configure 'create-stage-wrapper
                          (lambda _
                            (with-output-to-file "gcc.sh"