janneke pushed a commit to branch core-packages-team
in repository guix.
commit 2628a66509c603356ab31cfbc2fb7608f8277cb8
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Thu Dec 5 15:14:37 2024 +0100
gnu: libstdc++: Fix build for linux with gcc-14.
* gnu/packages/gcc.scm (make-libstdc++)[arguments]: Rename stage
"patch-hurd64
to "patch-tzdb.cc and use for gcc >= 14 unrestrictedly.
Change-Id: Icaf0a31744dc6102d96444f531f3ba1878a61b6c
---
gnu/packages/gcc.scm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 36783af37d..147f8a8ca9 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1030,14 +1030,14 @@ 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 (version>=? (package-version gcc) "14")
+ #~((add-after 'unpack 'patch-tzdb.cc
+ (lambda _
+ (substitute* "libstdc++-v3/src/c++20/tzdb.cc"
+ (("#if ! defined _GLIBCXX_ZONEINFO_DIR")
+ "#if 1 // ! defined _GLIBCXX_ZONEINFO_DIR")))))
+ '()))
#:configure-flags '`("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
