janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f6c7dd442c6a5f7c6883c2d1700702492d414fd7
Author: Jan Nieuwenhuizen <jann...@gnu.org>
Date: Sat Aug 25 09:30:44 2018 +0200
gnu: bootstrap-tarballs: Update inputs for i686-linux.
* gnu/packages/make-bootstrap.scm (%bootstrap-tarballs): Update inputs for
i686-linux.
* gnu/packages/bootstrap.scm (%bootstrap-inputs): Likewise.
---
gnu/packages/bootstrap.scm | 15 ++++++++++++---
gnu/packages/make-bootstrap.scm | 13 ++++++++++---
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index d6b9901..1786b8d 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -733,9 +733,18 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
(define %bootstrap-inputs
;; The initial, pre-built inputs. From now on, we can start building our
;; own packages.
- `(("libc" ,%bootstrap-glibc)
- ("gcc" ,%bootstrap-gcc)
- ("binutils" ,%bootstrap-binutils)
+ `(,@(match (%current-system)
+ ("i686-linux" `(("diffutils" ,%bootstrap-diffutils)
+ ("linux-libre-headers" ,%bootstrap-linux-libre-headers)
+ ("make" ,%bootstrap-make)
+ ("mescc-tools-seed" ,%mescc-tools-seed)
+ ("mes-seed" ,%mes-seed)
+ ("srfi-43" ,%srfi-43 )
+ ("tinycc-seed" ,%tinycc-seed)))
+
+ (_ `(("libc" ,%bootstrap-glibc)
+ ("gcc" ,%bootstrap-gcc)
+ ("binutils" ,%bootstrap-binutils))))
("coreutils&co" ,%bootstrap-coreutils&co)
;; In gnu-build-system.scm, we rely on the availability of Bash.
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index e78251a..804f226 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -827,9 +827,16 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
%build-inputs)
#t)))
(inputs `(("guile-tarball" ,%guile-bootstrap-tarball)
- ("gcc-tarball" ,%gcc-bootstrap-tarball)
- ("binutils-tarball" ,%binutils-bootstrap-tarball)
- ("glibc-tarball" ,(%glibc-bootstrap-tarball))
+ ,@(match (%current-system)
+ ("i686-linux" `(("diffutils-tarball"
,%diffutils-bootstrap-tarball)
+ ("make-tarball" ,%make-bootstrap-tarball)
+ ("mescc-tools-seed" ,(@ (gnu packages
bootstrap) %mescc-tools-seed))
+ ("mes-seed" ,(@ (gnu packages bootstrap)
%mes-seed))
+ ("srfi-43" ,(@ (gnu packages bootstrap)
%srfi-43))
+ ("tinycc-seed" ,(@ (gnu packages bootstrap)
%tinycc-seed))))
+ (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball)
+ ("binutils-tarball" ,%binutils-bootstrap-tarball)
+ ("glibc-tarball" ,(%glibc-bootstrap-tarball)))))
("coreutils&co-tarball" ,%bootstrap-binaries-tarball)))
(synopsis "Tarballs containing all the bootstrap binaries")
(description synopsis)
