01/04: gnu: %bootstrap-glibc: Patch more files.

[guix-commits]

efraim pushed a commit to branch core-updates
in repository guix.

commit c4a0acde1be607f8ad39c76d9eb98d9276884699
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Dec 10 12:57:46 2024 +0200

    gnu: %bootstrap-glibc: Patch more files.
    
    * gnu/packages/bootstrap.scm (%bootstrap-glibc)[arguments]: When
    building for x86* or arm* architectures also patch libpthread.so.
    
    Change-Id: Ief0c78444bbde5c4a1849daa53e13dc3b154b1ed
---
 gnu/packages/bootstrap.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 5973f9d214..ad1a0bc56d 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -774,10 +774,14 @@ $out/bin/guile --version~%"
               (chmod "lib" #o755)
 
               ;; Patch linker scripts so they refer to the right file-names.
-              (substitute* ,(if (target-hurd64?)
-                                ''("lib/libc.so" "lib/libm.so")
-                                "lib/libc.so")
-                (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix)
+              (substitute* ,(cond ((target-hurd64?)
+                                   ''("lib/libc.so" "lib/libm.so"))
+                                  ((or (target-x86?)
+                                       (target-arm?))
+                                   ''("lib/libc.so" "lib/libpthread.so"))
+                                  (else
+                                   ''("lib/libc.so")))
+                (("/[^ ]+/lib/(libc|libm|libh|libpthread|ld)" _ prefix)
                  (string-append out "/lib/" prefix)))))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))