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="