guix-commits
[Top][All Lists]
Advanced

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

03/17: gnu: gcc-boot0: Do not use 'coreutils-boot0' on GNU/Hurd.


From: guix-commits
Subject: 03/17: gnu: gcc-boot0: Do not use 'coreutils-boot0' on GNU/Hurd.
Date: Fri, 2 Jun 2023 11:24:02 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 48c7e71cd7c3690203d4a8961a651cae090af83f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jun 2 15:44:55 2023 +0200

    gnu: gcc-boot0: Do not use 'coreutils-boot0' on GNU/Hurd.
    
    Fixes <https://issues.guix.gnu.org/63789>.
    Reported by Janneke Nieuwenhuizen <janneke@gnu.org>.
    
    * gnu/packages/commencement.scm (gcc-boot0)[source]: Use
    '%bootstrap-coreutils&co' when on GNU/Hurd.
---
 gnu/packages/commencement.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 78cfa4acd0..7c7c11c174 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2333,7 +2333,12 @@ exec " gcc "/bin/" program
              ;; names, which cannot be repacked by BOOTSTRAP-ORIGIN.  Nor
              ;; can it be deleted from Guile, so resort to this evil hack.
              #$(origin-snippet (package-source gcc))
-             (system* #$(file-append coreutils-boot0 "/bin/rm") "-rf"
+             (system* #$(file-append (let-system system
+                                       ;; 'coreutils-boot0' is Linux-only.
+                                       (if (target-hurd? system)
+                                           %bootstrap-coreutils&co
+                                           coreutils-boot0))
+                                     "/bin/rm") "-rf"
                       
"gcc/testsuite/go.test/test/fixedbugs/issue27836.dir"))))))
     (arguments
      (cons*



reply via email to

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