mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01: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
parent b745f4fd20
commit f421f402f0
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/bootstrap.scm
View file

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