19/21: gnu: libstdc++: Fix build for x86_64-linux with gcc-14.

[guix-commits]

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

commit 15c434cfd5392bfbb73b6cff0f9fbd240946a88c
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Dec 5 15:14:37 2024 +0100

    gnu: libstdc++: Fix build for x86_64-linux with gcc-14.
    
    * gnu/packages/gcc.scm (make-libstdc++)[arguments]: When building with 
gcc-14
    for x86_64-linux 64bit Hurd, add stage patch-x86_64-linux.
    
    Change-Id: Icaf0a31744dc6102d96444f531f3ba1878a61b6c
---
 gnu/packages/gcc.scm | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 6247919fec..86f7a7df35 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1029,14 +1029,21 @@ using compilers other than GCC."
           (add-before 'configure 'chdir
             (lambda _
               (chdir "libstdc++-v3")))
-          #$@(let ((version (package-version gcc)))
-               (if (target-hurd64?)
-                   #~((add-after 'unpack 'patch-hurd64
-                        (lambda _
-                          (substitute* "libstdc++-v3/src/c++20/tzdb.cc"
-                            (("#if ! defined _GLIBCXX_ZONEINFO_DIR")
-                             "#if __GNU__ || ! defined 
_GLIBCXX_ZONEINFO_DIR")))))
-                   '())))
+          #$@(if (target-hurd64?)
+                 #~((add-after 'unpack 'patch-hurd64
+                      (lambda _
+                        (substitute* "libstdc++-v3/src/c++20/tzdb.cc"
+                          (("#if ! defined _GLIBCXX_ZONEINFO_DIR")
+                           "#if __GNU__ || ! defined 
_GLIBCXX_ZONEINFO_DIR")))))
+                 '())
+          #$@(if (and (target-x86-64?) (target-linux?)
+                      (version>=? (package-version gcc) "14"))
+                 #~((add-after 'unpack 'patch-x86_64-linux
+                      (lambda _
+                        (substitute* "libstdc++-v3/src/c++20/tzdb.cc"
+                          (("#if ! defined _GLIBCXX_ZONEINFO_DIR")
+                           "#if __x86_64__ || ! defined 
_GLIBCXX_ZONEINFO_DIR")))))
+                 '()))
 
       #:configure-flags '`("--disable-libstdcxx-pch"
                            ,(string-append "--with-gxx-include-dir="