guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/06: REMOVEME gnu: make-libstdc++: Undo previous patching for gcc-cros


From: guix-commits
Subject: 06/06: REMOVEME gnu: make-libstdc++: Undo previous patching for gcc-cross-boot0.
Date: Thu, 5 Dec 2024 09:21:27 -0500 (EST)

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

commit 02fdc34b8cf24a56f6f2e6ad36403a4a0841c8ae
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Dec 5 15:18:10 2024 +0100

    REMOVEME gnu: make-libstdc++: Undo previous patching for gcc-cross-boot0.
    
    Avoid a world rebuild at this time.
    
    * gnu/packages/gcc.scm (make-libstdc++): Avoid adding "patch-x86_64-linux"
    stage for gcc-cross-boot0.
    
    Change-Id: I494a63170dbcca6477ecf0e956630577c42cd0a0
---
 gnu/packages/gcc.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index ac9c6fb6b8..01194d7f85 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1034,7 +1034,8 @@ using compilers other than GCC."
                            "#if __GNU__ || ! defined 
_GLIBCXX_ZONEINFO_DIR")))))
                  '())
           #$@(if (and (target-x86-64?) (target-linux?)
-                      (version>=? (package-version gcc) "14"))
+                      (version>=? (package-version gcc) "14")
+                      (not (equal? (package-name gcc) "gcc-cross-boot0")))
                  #~((add-after 'unpack 'patch-x86_64-linux
                       (lambda _
                         (substitute* "libstdc++-v3/src/c++20/tzdb.cc"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]