diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-23 22:00:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-23 22:00:06 +0200 |
| commit | 40749fb6eb3c63e759e5b108b7092ed23b198aa7 (patch) | |
| tree | ebe8f246bb67125717b4dfbb7671430aa104fe7e | |
| parent | 131edf67a0d2493d5cd584f0af0e091c1586831e (diff) | |
| download | gnu-guix-40749fb6eb3c63e759e5b108b7092ed23b198aa7.tar gnu-guix-40749fb6eb3c63e759e5b108b7092ed23b198aa7.tar.gz | |
distro: Fix GCC tarball to include the `libexec' directory.
* distro/packages/base.scm (%gcc-stripped): Copy $gcc/libexec to $out.
| -rw-r--r-- | distro/packages/base.scm | 14 |
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))))) |