~ruther/guix-local: Partial revert "gnu: bootstrap: %bootstrap-glibc: Also fix libm.so."

126a2e8cb45b797579876834a566cec51f4a16a8 — Zheng Junjie 1 year, 11 months ago 7b64a96

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

This partially reverts commit 204fe1b1f05f4438d1cf72c568b45696e55e54c9.

This part accidentally triggered a world rebuild for non-x86 architectures.

Change-Id: I921984ef5eff58792ffc17b64675db6a8e79695c

patch browse .tar.gz .zip

1 files changed, 8 insertions(+), 5 deletions(-)

M gnu/packages/bootstrap.scm

M gnu/packages/bootstrap.scm => gnu/packages/bootstrap.scm +8 -5

@@ 775,11 775,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)
-                 (string-append out "/lib/" prefix)))))))))
+              ,(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))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))
        ("xz"  ,(bootstrap-executable "xz" (%current-system)))