guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#74689] [PATCH v2 2/3] Partial revert "gnu: bootstrap: %bootstrap-gl


From: Zheng Junjie
Subject: [bug#74689] [PATCH v2 2/3] Partial revert "gnu: bootstrap: %bootstrap-glibc: Also fix libm.so."
Date: Thu, 5 Dec 2024 00:57:43 +0800

This partially reverts commit 204fe1b1f05f4438d1cf72c568b45696e55e54c9.

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

Change-Id: I921984ef5eff58792ffc17b64675db6a8e79695c
---
 gnu/packages/bootstrap.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 226cf0804bd..dcf385b03e9 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -775,11 +775,14 @@ (define %bootstrap-glibc
               (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)))
-- 
2.46.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]