[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/54: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
From: |
guix-commits |
Subject: |
54/54: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash. |
Date: |
Fri, 22 Nov 2019 18:17:59 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit d3fc856d02fb31468e8e99b321cba22662215213
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 23:05:15 2019 +0100
bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
* gnu/packages/bootstrap.scm (%bootstrap-inputs)[i686-linux,x86-linux]:
Remove
%bootstrap-coreutils&co, %bootstrap-bash.
---
gnu/packages/bootstrap.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index d0f3748..081a1f7 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -874,19 +874,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.
- `(,@(match (%current-system)
- ((or "i686-linux" "x86_64-linux")
- `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
- ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
- ("mes" ,%bootstrap-mes)))
- (_
- `(("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.
- ("bash" ,%bootstrap-coreutils&co)))
+ (match (%current-system)
+ ((or "i686-linux" "x86_64-linux")
+ `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
+ ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
+ ("mes" ,%bootstrap-mes)))
+ (_
+ `(("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.
+ ("bash" ,%bootstrap-coreutils&co)))))
(define %bootstrap-inputs-for-tests
;; These are bootstrap inputs that are cheap to produce (no compilation
- 42/54: bootstrap: Add xz-mesboot., (continued)
- 42/54: bootstrap: Add xz-mesboot., guix-commits, 2019/11/22
- 48/54: bootstrap: gcc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 43/54: bootstrap: Add hello-mesboot., guix-commits, 2019/11/22
- 47/54: bootstrap: gcc-mesboot1-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/22
- 46/54: bootstrap: glibc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 37/54: bootstrap: Add gawk-mesboot., guix-commits, 2019/11/22
- 20/54: bootstrap: tcc-boot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 41/54: bootstrap: Add gcc-mesboot1: Scheme-only bootstrap., guix-commits, 2019/11/22
- 53/54: bootstrap: Add sed-boot0., guix-commits, 2019/11/22
- 50/54: bootstrap: Add coreutils-mesboot., guix-commits, 2019/11/22
- 54/54: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.,
guix-commits <=
- 36/54: bootstrap: Add make-mesboot., guix-commits, 2019/11/22
- 44/54: bootstrap: binutils-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 25/54: bootstrap: gcc-core-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22
- 29/54: bootstrap: mesboot-headers: Scheme-only bootstrap., guix-commits, 2019/11/22
- 34/54: bootstrap: Add binutils-mesboot1., guix-commits, 2019/11/22
- 35/54: bootstrap: Add coreutils-mesboot0., guix-commits, 2019/11/22
- 45/54: bootstrap: glibc-headers-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 39/54: bootstrap: Add gcc-core-mesboot1., guix-commits, 2019/11/22
- 51/54: bootstrap: Remove m4-bootstrap., guix-commits, 2019/11/22
- 52/54: bootstrap: %bootstrap-inputs+toolchain: Scheme-only bootstrap., guix-commits, 2019/11/22