guix-commits
[Top][All Lists]
Advanced

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

42/57: bootstrap: gcc-mesboot-wrapper: Use Gash instead of coreutils&co.


From: guix-commits
Subject: 42/57: bootstrap: gcc-mesboot-wrapper: Use Gash instead of coreutils&co.
Date: Mon, 16 Dec 2019 13:20:13 -0500 (EST)

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

commit 764873d0ee609a61eb4b8accefc27a05895879a6
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Nov 22 22:34:32 2019 +0100

    bootstrap: 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 6f65d72..677a1fd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2663,10 +2663,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]