66/85: gnu: musl-boot0: Fix installation order of headers.

[guix-commits]

efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.

commit 6e723e3f709122e938daaaa75b106a9df3d1ee71
Author: Efraim Flashner <efraim@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 66e31febec..0eb5cc9cc5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -985,9 +985,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")))))))))))