[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
169/207: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time.
From: |
Jan Nieuwenhuizen |
Subject: |
169/207: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time. |
Date: |
Sat, 8 Sep 2018 13:26:25 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8fd0e35b504de7cf6d474cfc7c67f4d4fc0d6ab4
Author: Jan Nieuwenhuizen <address@hidden>
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 3642c00..2cf86ba 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 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
- 125/207: gnu: glibc-mesboot: Revise dependencies., (continued)
- 125/207: gnu: glibc-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/08
- 178/207: gnu: tcc-boot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 201/207: gnu: file-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 164/207: gnu: Add gcc-mesboot-wrapper 4.7.4., Jan Nieuwenhuizen, 2018/09/08
- 195/207: glibc-mesboot: do not validate runpath, Jan Nieuwenhuizen, 2018/09/08
- 162/207: gnu: Add glibc-mesboot 2.3.6. WIP, Jan Nieuwenhuizen, 2018/09/08
- 202/207: gnu: libstdc++-boot0: Copy libstdc++.so.6.0.20 to pass install., Jan Nieuwenhuizen, 2018/09/08
- 107/207: gnu: Add gcc-mesboot 4.1.0., Jan Nieuwenhuizen, 2018/09/08
- 73/207: gnu: gcc-boot: Update to 3.2., Jan Nieuwenhuizen, 2018/09/08
- 200/207: gnu: findutils-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 169/207: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time.,
Jan Nieuwenhuizen <=
- 136/207: gnu: tcc-boot0: Use gnu-build-system., Jan Nieuwenhuizen, 2018/09/08
- 189/207: gnu: make-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 182/207: gnu: binutils-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 184/207: gnu: mesboot-headers: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 159/207: gcc-mesboot: use package-full-name "-" :-), Jan Nieuwenhuizen, 2018/09/08
- 149/207: gnu: tcc-boot: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/08
- 204/207: gnu: gcc-boot0: Workaround libtool install bug., Jan Nieuwenhuizen, 2018/09/08
- 186/207: gnu: gcc-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 190/207: gnu: gcc-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 56/207: gnu: mescc-tools-boot: Update for mes 0.15., Jan Nieuwenhuizen, 2018/09/08