diff --git a/build-aux/check-final-inputs-self-contained.scm b/build-aux/check-final-inputs-self-contained.scm index 255286be29eb826910d0cbbbee905f1b57fc7b85..dc44c4b636f7e02edf8aa324f95d20d3faf2bc43 100644 --- a/build-aux/check-final-inputs-self-contained.scm +++ b/build-aux/check-final-inputs-self-contained.scm @@ -37,12 +37,17 @@ (define (final-inputs store system) (let ((drv (package-derivation store package system))) ;; Libc's 'debug' output refers to gcc-cross-boot0, but it's ;; 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 (("debug" . directory) (if (string=? "glibc" (package-name package)) #f directory)) + (("include" . directory) + (if (string=? "bash" (package-name package)) + #f + directory)) ((_ . directory) directory)) (derivation->output-paths drv))))) %final-inputs)) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2431babcada383846b78dfee17c426450ddb1fe1..c7aa59e9a22c44d0202cd0c366f48ea241ebef39 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -783,6 +783,7 @@ (define %boot3-inputs (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference ;; to the bootstrap GCC. + ;; FIXME: This depends on 'bootstrap-binaries' via Makefile.in. (package-with-bootstrap-guile (package-with-explicit-inputs (static-libgcc-package bash) %boot3-inputs