guix-commits
[Top][All Lists]
Advanced

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

40/58: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreu


From: guix-commits
Subject: 40/58: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co.
Date: Thu, 6 Feb 2020 17:52:22 -0500 (EST)

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit f9baf050a6a4c762a06287a9dc111d2c9a2da330
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Nov 22 22:34:32 2019 +0100

    gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co.
    
    * gnu/packages/commencement.scm (gcc-mesboot-wrapper): Use Gash instead of
    coreutils&co.
    (%boot-mesboot5-inputs): New variable.
---
 gnu/packages/commencement.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index cea599a..4ef80c5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2605,10 +2605,16 @@ exec " gcc "/bin/" program
     (version (package-version gcc-mesboot))
     (source #f)
     (inputs '())
-    (native-inputs `(("bash" ,%bootstrap-coreutils&co)
+    (native-inputs `(("bash" ,bash-mesboot)
+                     ("coreutils" ,coreutils-mesboot0)
                      ("libc" ,glibc-mesboot)
                      ("gcc" ,gcc-mesboot)))))
 
+(define (%boot-mesboot5-inputs)
+  `(("gcc-wrapper" ,gcc-mesboot-wrapper)
+    ("gcc" ,gcc-mesboot)
+    ,@(fold alist-delete (%boot-mesboot4-inputs) '("gcc" "gcc-wrapper"))))
+
 (define m4-mesboot
   (package
     (inherit m4)



reply via email to

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