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

build: check-final-inputs-self-contained has an exception for 'bash:include'. 

Currently 'bash:include' of the final Bash depends on bootstrap stuff.

* build-aux/check-final-inputs-self-contained.scm (final-inputs): Add
clause for 'bash:include'.
* gnu/packages/commencement.scm (bash-final): Add FIXME comment.
This commit is contained in:
Ludovic Courtès 2016-12-18 12:09:13 +01:00
parent 5073ecf055
commit 8a4c988892
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-aux/check-final-inputs-self-contained.scm
View File

@ -37,12 +37,17 @@
(let ((drv (package-derivation store package system))) (let ((drv (package-derivation store package system)))
;; Libc's 'debug' output refers to gcc-cross-boot0, but it's ;; Libc's 'debug' output refers to gcc-cross-boot0, but it's
;; hard to avoid, so we tolerate it. This should be the ;; hard to avoid, so we tolerate it. This should be the
;; only exception. ;; only exception. Likewise, 'bash:include' depends on
;; bootstrap-binaries via its 'Makefile.inc' (FIXME).
(filter-map (match-lambda (filter-map (match-lambda
(("debug" . directory) (("debug" . directory)
(if (string=? "glibc" (package-name package)) (if (string=? "glibc" (package-name package))
#f #f
directory)) directory))
(("include" . directory)
(if (string=? "bash" (package-name package))
#f
directory))
((_ . directory) directory)) ((_ . directory) directory))
(derivation->output-paths drv))))) (derivation->output-paths drv)))))
%final-inputs)) %final-inputs))

1
gnu/packages/commencement.scm
View File

@ -783,6 +783,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define bash-final (define bash-final
;; Link with `-static-libgcc' to make sure we don't retain a reference ;; Link with `-static-libgcc' to make sure we don't retain a reference
;; to the bootstrap GCC. ;; to the bootstrap GCC.
;; FIXME: This depends on 'bootstrap-binaries' via Makefile.in.
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs (static-libgcc-package bash) (package-with-explicit-inputs (static-libgcc-package bash)
%boot3-inputs %boot3-inputs