diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-05 20:55:05 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:10 +0200 |
| commit | f189772fba0d285f368fbe4f7bb398c9da88c437 (patch) | |
| tree | ca96ab3788a49d3f96f87d057ab1f0c037a3ba47 | |
| parent | e50f470fe6f66f48e7a5c8b7174f24aad6d9999b (diff) | |
Revert "Partial revert "gnu: bootstrap: %bootstrap-glibc: Also fix libm.so.""
This cleanup was reverted because it led to a world rebuild.
This reverts commit 126a2e8cb45b797579876834a566cec51f4a16a8.
Change-Id: I5c862602c3722c787e0ed6deac55920007411fd5
| -rw-r--r-- | gnu/packages/bootstrap.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 15d8c758c6..59adc7f50a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -778,14 +778,11 @@ $out/bin/guile --version~%" (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))) |