guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

58/155: build: check-final-inputs-self-contained has an exception for 'b


From: John Darrington
Subject: 58/155: build: check-final-inputs-self-contained has an exception for 'bash:include'.
Date: Wed, 21 Dec 2016 20:48:33 +0000 (UTC)

jmd pushed a commit to branch wip-installer
in repository guix.

commit 0f64b97fed68f9c2b616f899c4b56fa43dbcdcba
Author: Ludovic Court├Ęs <address@hidden>
Date:   Sun Dec 18 12:09:13 2016 +0100

    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.
---
 build-aux/check-final-inputs-self-contained.scm |    7 ++++++-
 gnu/packages/commencement.scm                   |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build-aux/check-final-inputs-self-contained.scm 
b/build-aux/check-final-inputs-self-contained.scm
index 255286b..dc44c4b 100644
--- a/build-aux/check-final-inputs-self-contained.scm
+++ b/build-aux/check-final-inputs-self-contained.scm
@@ -37,12 +37,17 @@
                 (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 2431bab..c7aa59e 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -783,6 +783,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"address@hidden"~%"
 (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]