03/08: gnu: gcc-toolchain: Remove "glibc:debug" and "glibc:static" from "out".

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit badd2161724b6fe7acd1da5144ebfe68ffc2b3b6
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jun 29 23:12:13 2020 +0200

    gnu: gcc-toolchain: Remove "glibc:debug" and "glibc:static" from "out".
    
    With this change, the closure of "gcc-toolchain:out" goes from 1 GiB to
    393 MiB, which was the intention.
    
    * gnu/packages/commencement.scm (make-gcc-toolchain): Filter out
    "libc-debug" and "libc-static" from OUT.
---
 gnu/packages/commencement.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 59ef5d0..ef250e0 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3828,14 +3828,17 @@ COREUTILS-FINAL vs. COREUTILS, etc."
        '(#:modules ((guix build union))
          #:builder (begin
                      (use-modules (ice-9 match)
+                                  (srfi srfi-1)
                                   (srfi srfi-26)
                                   (guix build union))
 
                      (let ((out (assoc-ref %outputs "out")))
-
-                       (match %build-inputs
-                         (((names . directories) ...)
-                          (union-build out directories)))
+                       (union-build out
+                                    (filter-map (match-lambda
+                                                  (("libc-debug" . _) #f)
+                                                  (("libc-static" . _) #f)
+                                                  ((_ . directory) directory))
+                                                %build-inputs))
 
                        (union-build (assoc-ref %outputs "debug")
                                     (list (assoc-ref %build-inputs