janneke pushed a commit to branch wip-bootstrap in repository guix. commit 62b620815935cae55b2db068e656b24b75adcefa Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Fri Aug 31 15:29:50 2018 +0200
bootstrap: Evaluate %bootstrap-inputs+toolchain at build time. Turn '%bootstrap-inputs+toolchain' into a thunk so that (%current-system) is evaluated at the right time. --- gnu/packages/commencement.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fe8d357..9ee218a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1686,7 +1686,7 @@ exec " gcc "/bin/" program (system* "./configure" (string-append "--prefix=" out)))))))))))) -(define %bootstrap-inputs+toolchain +(define (%bootstrap-inputs+toolchain) (append (match (%current-system) ("i686-linux" `(;;("libc" ,glibc-mesboot) ; FIXME: make usable for unpatched gnu-make-boot0, *-boot0 ("libc" ,%bootstrap-glibc) @@ -1719,13 +1719,13 @@ exec " gcc "/bin/" program (install-file "make" bin) #t)))))))) (native-inputs '()) ; no need for 'pkg-config' - (inputs %bootstrap-inputs+toolchain)))) + (inputs (%bootstrap-inputs+toolchain))))) (define-public diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils `(("make" ,gnu-make-boot0) - ,@%bootstrap-inputs+toolchain) + ,@(%bootstrap-inputs+toolchain)) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -1739,7 +1739,7 @@ exec " gcc "/bin/" program (name "findutils-boot0")) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ; for tests - ,@%bootstrap-inputs+toolchain) + ,@(%bootstrap-inputs+toolchain)) (current-source-location) #:guile %bootstrap-guile))) @@ -1747,7 +1747,7 @@ exec " gcc "/bin/" program (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs file `(("make" ,gnu-make-boot0) - ,@%bootstrap-inputs+toolchain) + ,@(%bootstrap-inputs+toolchain)) #:guile %bootstrap-guile))) (package (inherit p) @@ -1779,7 +1779,7 @@ exec " gcc "/bin/" program ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) - ,@%bootstrap-inputs+toolchain)) + ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) ;; Return the triplet used to create the cross toolchain needed in the