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

distro: Build the final inputs against the final Bash, not the bootstrap Bash. 

* distro/packages/base.scm (%boot4-inputs): New variable.
  (guile-final): Use it.
  (%final-inputs): Build with %BOOT4-INPUTS, not %BOOT3-INPUTS.
This commit is contained in:
Ludovic Courtès 2012-10-25 17:55:45 +02:00
parent e67245597e
commit 4033bde841
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
distro/packages/base.scm
View File

@ -2062,11 +2062,18 @@ store.")
(current-source-location)
#:guile %bootstrap-guile)))
(define %boot4-inputs
;; Now use the final Bash.
`(("bash" ,bash-final)
,@(alist-delete "bash" %boot3-inputs)))
(define-public guile-final
;; FIXME: The Libtool used here, specifically its `bin/libtool' script,
;; holds a dependency on the bootstrap Binutils. Use multiple outputs for
;; Libtool, so that that dependency is isolated in the "bin" output.
(package-with-bootstrap-guile
(package-with-explicit-inputs guile-2.0
`(("bash" ,bash-final)
,@(alist-delete "bash" %boot3-inputs))
%boot4-inputs
(current-source-location)
#:guile %bootstrap-guile)))
@ -2079,7 +2086,7 @@ store.")
(define-public %final-inputs
;; Final derivations used as implicit inputs by `gnu-build-system'.
(let ((finalize (cut package-with-explicit-inputs <> %boot3-inputs
(let ((finalize (cut package-with-explicit-inputs <> %boot4-inputs
(current-source-location))))
`(,@(map (match-lambda
((name package)