guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 02/02: gnu: %bootstrap-glibc: Fix linking on armhf-linux.
Date: Tue, 10 Dec 2024 10:25:35 -0500 (EST)

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

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

    gnu: %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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index ba0fbd7295..892730d0b9 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -787,7 +787,11 @@ $out/bin/guile --version~%"
                      `(("/[^ ]+/lib/(libc|libm|libpthread|ld)" _ prefix)
                        (string-append out "/lib/" prefix))
                      `(("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix)
-                       (string-append out "/lib/" 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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]