janneke pushed a commit to branch core-packages-team
in repository guix.
commit d21fbfb34e35064b863a9db23610baccfc815a2c
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Dec 10 12:57:46 2024 +0200
gnu: bootstrap: %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 59adc7f50a..cc235abce4 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -778,10 +778,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)))
