janneke pushed a commit to branch core-packages-team-old
in repository guix.
commit ab129486686b2cc92f953a91b863bc7644238b14
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Thu Dec 5 15:14:37 2024 +0100
gnu: libstdc++: Fix build for x86-linux with gcc-14.
* gnu/packages/gcc.scm (make-libstdc++)[arguments]: When building with
gcc-14
for x86-linux, 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..6fdc47dc94 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?) (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="
