diff options
author | Mark H Weaver <mhw@netris.org> | 2016-11-06 03:29:06 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-11-06 03:29:06 -0500 |
commit | 8b6ad165d1fa479e5da2938d099dba356186e07c (patch) | |
tree | c30c024fd79497031c21c68d6c5688334d900467 /gnu/packages/make-bootstrap.scm | |
parent | 9422c98a0a2bf2c48d8e10e59d838ab23870eb10 (diff) | |
parent | 7f4658983a742072be4e28b227d6349461e9a68b (diff) | |
download | guix-8b6ad165d1fa479e5da2938d099dba356186e07c.tar guix-8b6ad165d1fa479e5da2938d099dba356186e07c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
-rw-r--r-- | gnu/packages/make-bootstrap.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d2df69d1e5..f31db6aaef 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -23,7 +23,6 @@ #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) #:use-module ((gnu packages) #:select (search-patch)) - #:use-module ((gnu packages commencement) #:select (%final-inputs)) #:use-module (gnu packages base) #:use-module (gnu packages cross-base) #:use-module (gnu packages bash) @@ -101,14 +100,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (cross-binutils target) (cross-bootstrap-libc))) ("cross-binutils" ,(cross-binutils target)) - ,@%final-inputs)) + ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap)) ("gcc" ,(package (inherit gcc) (outputs '("out")) ; all in one so libgcc_s is easily found (inputs `(("libc",(glibc-for-bootstrap)) ,@(package-inputs gcc))))) - ,@(fold alist-delete %final-inputs '("libc" "gcc"))))) + ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) (package-with-explicit-inputs p inputs (current-source-location) |