nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs. 

* gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): : New procedure
replacing %bootstrap-inputs to prepare for Mes bootstrap.  Update users.
* tests/union.scm (%bootstrap-inputs): New variable: set to
%bootstrap-inputs+toolchain.
This commit is contained in:
Jan Nieuwenhuizen 2018-09-09 13:33:41 +02:00
parent a2b2070b67
commit c362904485
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/commencement.scm
View File

@ -79,6 +79,9 @@
;;;
;;; Code:
(define (%bootstrap-inputs+toolchain)
(%bootstrap-inputs))
(define gnu-make-boot0
(package-with-bootstrap-guile
(package (inherit gnu-make)
@ -101,13 +104,13 @@
(install-file "make" bin)
#t))))))))
(native-inputs '()) ; no need for 'pkg-config'
(inputs (%bootstrap-inputs)))))
(inputs (%bootstrap-inputs+toolchain)))))
(define diffutils-boot0
(package-with-bootstrap-guile
(let ((p (package-with-explicit-inputs diffutils
`(("make" ,gnu-make-boot0)
,@(%bootstrap-inputs))
,@(%bootstrap-inputs+toolchain))
#:guile %bootstrap-guile)))
(package (inherit p)
(name "diffutils-boot0")
@ -121,7 +124,7 @@
(name "findutils-boot0"))
`(("make" ,gnu-make-boot0)
("diffutils" ,diffutils-boot0) ; for tests
,@(%bootstrap-inputs))
,@(%bootstrap-inputs+toolchain))
(current-source-location)
#:guile %bootstrap-guile)))
@ -131,17 +134,16 @@
(inherit file)
(name "file-boot0"))
`(("make" ,gnu-make-boot0)
,@(%bootstrap-inputs))
,@(%bootstrap-inputs+toolchain))
(current-source-location)
#:guile %bootstrap-guile)))
(define (%boot0-inputs)
`(("make" ,gnu-make-boot0)
("diffutils" ,diffutils-boot0)
("findutils" ,findutils-boot0)
("file" ,file-boot0)
,@(%bootstrap-inputs)))
,@(%bootstrap-inputs+toolchain)))
(define* (boot-triplet #:optional (system (%current-system)))
;; Return the triplet used to create the cross toolchain needed in the
@ -150,8 +152,9 @@
;; Following Linux From Scratch, build a cross-toolchain in stage 0. That
;; toolchain actually targets the same OS and arch, but it has the advantage
;; of being independent of the libc and tools in (%BOOTSTRAP-INPUTS), since
;; GCC-BOOT0 (below) is built without any reference to the target libc.
;; of being independent of the libc and tools in
;; (%BOOTSTRAP-INPUTS+TOOLCHAIN), since GCC-BOOT0 (below) is built without any
;; reference to the target libc.
(define binutils-boot0
(package-with-bootstrap-guile

4
tests/union.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -31,6 +32,9 @@
#:use-module (rnrs io ports)
#:use-module (ice-9 match))
(define %bootstrap-inputs
(@@ (gnu packages commencement) %bootstrap-inputs+toolchain))
;; Exercise the (guix build union) module.
(define %store