janneke pushed a commit to branch core-packages-team-old
in repository guix.
commit 53420a25b6b128843b57aebcf91fd665784d2ba3
Author: Efraim Flashner <efr...@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)))
