janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 43e3bb77bd160c83de68ca61e51c66f9bd8eda63
Author: Jan Nieuwenhuizen <[email protected]>
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 41bbc2d..9999a89 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2697,10 +2697,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)