diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-03-25 00:22:53 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-03-25 00:26:13 +0100 |
| commit | 4debffadb7e166e34fb2ef00e75c4b73977ede15 (patch) | |
| tree | 57dc4a45be9cf45643969cdf6125a7ce71233728 | |
| parent | c91e0f1ab3c24681d1a7365a349bc1a29d2efec8 (diff) | |
| download | guix-4debffadb7e166e34fb2ef00e75c4b73977ede15.tar guix-4debffadb7e166e34fb2ef00e75c4b73977ede15.tar.gz | |
maint: Adjust 'check-final-inputs-self-contained' for glibc:static.
This change is necessary to cope with
6dff905e51202bbdebbad8811b6509584d12a796.
* build-aux/check-final-inputs-self-contained.scm (final-inputs): Change
'match' pattern to match (LABEL PACKAGE OUTPUT).
| -rw-r--r-- | build-aux/check-final-inputs-self-contained.scm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/build-aux/check-final-inputs-self-contained.scm b/build-aux/check-final-inputs-self-contained.scm index dfb6a72f24..37dc883d3c 100644 --- a/build-aux/check-final-inputs-self-contained.scm +++ b/build-aux/check-final-inputs-self-contained.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,23 +33,23 @@ (define (final-inputs store system) "Return the list of outputs directories of the final inputs for SYSTEM." (append-map (match-lambda - ((name package) - (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. 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))))) + ((or (name package) (name package _)) + (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. 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)) (define (assert-valid-substitute substitute) |