amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Partial revert "gnu: bootstrap: %bootstrap-glibc: Also fix libm.so.""

Browse source 
This cleanup was reverted because it led to a world rebuild.

This reverts commit 126a2e8cb4.

Change-Id: I5c862602c3722c787e0ed6deac55920007411fd5
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-05 20:55:05 +01:00 • committed by Andreas Enge
parent e50f470fe6
commit f189772fba
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/bootstrap.scm
View file

@ -778,14 +778,11 @@ $out/bin/guile --version~%"
(chmod "lib" #o755) (chmod "lib" #o755)
;; Patch linker scripts so they refer to the right file-names. ;; Patch linker scripts so they refer to the right file-names.
,(if (target-hurd64?) (substitute* ,(if (target-hurd64?)
'(substitute* '("lib/libc.so" "lib/libm.so") ''("lib/libc.so" "lib/libm.so")
(("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix) "lib/libc.so")
(string-append out "/lib/" prefix))) (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix)
'(substitute* "lib/libc.so" (string-append out "/lib/" prefix)))))))))
(("/[^ ]+/lib/(libc|ld)" _ prefix)
(string-append out "/lib/" prefix))))
#t))))))
(inputs (inputs
`(("tar" ,(bootstrap-executable "tar" (%current-system))) `(("tar" ,(bootstrap-executable "tar" (%current-system)))
("xz" ,(bootstrap-executable "xz" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system)))