65/74: gnu: bootstrap: %bootstrap-glibc: Fix linking on armhf-linux.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit f81d7e7d8cfe66b071c5db671d69b0784fd07aa6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Dec 10 17:00:19 2024 +0200

    gnu: bootstrap: %bootstrap-glibc: Fix linking on armhf-linux.
    
    * gnu/packages/bootstrap.scm (%bootstrap-glibc)[arguments]: When
    building for armhf-linux remove a reference to a non-existent library.
    
    Change-Id: I587ba7a40eb05b354e4a11d07e9f4313108e43d1
---
 gnu/packages/bootstrap.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index ad1a0bc56d..d526428482 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -781,8 +781,12 @@ $out/bin/guile --version~%"
                                    ''("lib/libc.so" "lib/libpthread.so"))
                                   (else
                                    ''("lib/libc.so")))
-                (("/[^ ]+/lib/(libc|libm|libh|libpthread|ld)" _ prefix)
-                 (string-append out "/lib/" prefix)))))))))
+                (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
+                 (string-append out "/lib/" prefix))
+                ,@(if (target-arm32?)
+                      `((substitute* "lib/libpthread.so"
+                          (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
+                      `()))))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))
        ("xz"  ,(bootstrap-executable "xz" (%current-system)))