summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/commencement.scm19
-rw-r--r--tests/union.scm4
2 files changed, 15 insertions, 8 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a4e71b000b..12d5b528fd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -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
diff --git a/tests/union.scm b/tests/union.scm
index 5599625447..091895ff8e 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -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