guix_mirror_bot pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 1e7828f98670603961f74479e3fed0f10b4ea654
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Sun Nov 24 17:00:06 2024 +0200
gnu: musl-boot0: Fix installation order of headers.
* gnu/packages/commencement.scm (musl-boot0)[arguments]: Reverse the
order of the headers to be installed.
Change-Id: Icfbf2e1e7e737192899d4074a9183b6267fad5f9
---
gnu/packages/commencement.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index cd83c172f5..3d48107f67 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1010,9 +1010,12 @@ MesCC-Tools), and finally M2-Planet.")
(for-each (lambda (file)
(install-file file (string-append incl "/bits")))
(append
- (find-files (string-append "arch/" arch "/bits"))
+ ;; Instead of checking if the header already
exists
+ ;; install them in a 'backwards' order, so the
+ ;; preferred one never ends up overridden.
+ (find-files "obj/include/bits")
(find-files "arch/generic/bits")
- (find-files "obj/include/bits")))
+ (find-files (string-append "arch/" arch
"/bits"))))
(when (file-exists? (string-append lib "/libc.so"))
(symlink "libc.so"
(string-append lib "/ld-musl-" arch
".so.1")))))))))))
