From 1a99a9c45c9c8708b7b28979759e342e56424e4c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 9 Oct 2018 19:30:11 +0200 Subject: bootstrap: Build with %bootstrap-mes. * gnu/packages/bootstrap.scm (%tinycc-seed): Remove. (%bootstrap-inputs): Use %bootstrap-mes instead of %mes-seed and %tinycc-seed. * gnu/packages/commencement.scm (mescc-tools-boot, mes-boot, tcc-boot0): Build with %bootstrap-mes instead of %mes-seed and %tinycc-seed. --- gnu/packages/bootstrap.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'gnu/packages/bootstrap.scm') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3d4f1f5036..7e6200c576 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -51,9 +51,7 @@ %bootstrap-inputs %bootstrap-mes %mescc-tools-seed - %mes-seed - %srfi-43 - %tinycc-seed)) + %srfi-43)) ;;; Commentary: ;;; @@ -680,28 +678,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (base32 "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) -(define %mes-seed - (let ((commit "057fd36735b5605fe582d6b3625f793a62922206")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed" - "/-/archive/" commit - "/mes-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) - -(define %tinycc-seed - (let ((commit "843d47ca682617f21333b50c67851797b8c3fd04")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/tinycc-seed" - "/-/archive/" commit - "/tinycc-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0599wwv30js03l1rpmvzfclq3jadzvq04pi29j45nf6fyfg5hhqb"))))) - (define %srfi-43 (origin (method url-fetch) @@ -718,9 +694,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) ("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-seed" ,%mes-seed) - ("srfi-43" ,%srfi-43 ) - ("tinycc-seed" ,%tinycc-seed))) + ("mes" ,%bootstrap-mes) + ("srfi-43" ,%srfi-43 ))) (_ `(("libc" ,%bootstrap-glibc) ("gcc" ,%bootstrap-gcc) -- cgit v1.2.3