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

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit f421f402f013c330da40c55d68b00d5ecdfdf6f7
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Dec 5 20:55:05 2024 +0100

    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
---
 gnu/packages/bootstrap.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index d14bb68425..5973f9d214 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -774,14 +774,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)))