mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
distro: Fix GCC tarball to include the `libexec' directory.
* distro/packages/base.scm (%gcc-stripped): Copy $gcc/libexec to $out.
This commit is contained in:
parent
131edf67a0
commit
40749fb6eb
1 changed files with 10 additions and 4 deletions
|
@ -2337,10 +2337,11 @@ (define %gcc-stripped
|
||||||
(guix build utils))
|
(guix build utils))
|
||||||
|
|
||||||
(setvbuf (current-output-port) _IOLBF)
|
(setvbuf (current-output-port) _IOLBF)
|
||||||
(let* ((out (assoc-ref %outputs "out"))
|
(let* ((out (assoc-ref %outputs "out"))
|
||||||
(bindir (string-append out "/bin"))
|
(bindir (string-append out "/bin"))
|
||||||
(libdir (string-append out "/lib"))
|
(libdir (string-append out "/lib"))
|
||||||
(gcc (assoc-ref %build-inputs "gcc")))
|
(libexecdir (string-append out "/libexec"))
|
||||||
|
(gcc (assoc-ref %build-inputs "gcc")))
|
||||||
(copy-recursively (string-append gcc "/bin") bindir)
|
(copy-recursively (string-append gcc "/bin") bindir)
|
||||||
(for-each remove-store-references
|
(for-each remove-store-references
|
||||||
(find-files bindir ".*"))
|
(find-files bindir ".*"))
|
||||||
|
@ -2349,6 +2350,11 @@ (define %gcc-stripped
|
||||||
(for-each remove-store-references
|
(for-each remove-store-references
|
||||||
(remove (cut string-suffix? ".h" <>)
|
(remove (cut string-suffix? ".h" <>)
|
||||||
(find-files libdir ".*")))
|
(find-files libdir ".*")))
|
||||||
|
|
||||||
|
(copy-recursively (string-append gcc "/libexec")
|
||||||
|
libexecdir)
|
||||||
|
(for-each remove-store-references
|
||||||
|
(find-files libexecdir ".*"))
|
||||||
#t))))
|
#t))))
|
||||||
(inputs `(("gcc" ,%gcc-static)))))
|
(inputs `(("gcc" ,%gcc-static)))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue