distro: Fix GCC tarball to include the `libexec' directory.

* distro/packages/base.scm (%gcc-stripped): Copy $gcc/libexec to $out.

1 files changed, 10 insertions, 4 deletions

diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index 312ae66f8a..aeb82ec286 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -2337,10 +2337,11 @@ store.")
                       (guix build utils))
 
          (setvbuf (current-output-port) _IOLBF)
-         (let* ((out    (assoc-ref %outputs "out"))
-                (bindir (string-append out "/bin"))
-                (libdir (string-append out "/lib"))
-                (gcc    (assoc-ref %build-inputs "gcc")))
+         (let* ((out        (assoc-ref %outputs "out"))
+                (bindir     (string-append out "/bin"))
+                (libdir     (string-append out "/lib"))
+                (libexecdir (string-append out "/libexec"))
+                (gcc        (assoc-ref %build-inputs "gcc")))
            (copy-recursively (string-append gcc "/bin") bindir)
            (for-each remove-store-references
                      (find-files bindir ".*"))
@@ -2349,6 +2350,11 @@ store.")
            (for-each remove-store-references
                      (remove (cut string-suffix? ".h" <>)
                              (find-files libdir ".*")))
+
+           (copy-recursively (string-append gcc "/libexec")
+                             libexecdir)
+           (for-each remove-store-references
+                     (find-files libexecdir ".*"))
            #t))))
     (inputs `(("gcc" ,%gcc-static)))))