guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: rust-1.55: Fix building on riscv64-linux.


From: guix-commits
Subject: 02/02: gnu: rust-1.55: Fix building on riscv64-linux.
Date: Sun, 10 Jul 2022 13:42:01 -0400 (EDT)

efraim pushed a commit to branch staging
in repository guix.

commit 05e3ff8f3881caee73a8490d9bee8d3e82e7db13
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Jul 10 20:07:09 2022 +0300

    gnu: rust-1.55: Fix building on riscv64-linux.
    
    * gnu/packages/rust.scm (rust-1.55)[source]: Adjust snippet to fix
    riscv64 support in jemallocator crate.
---
 gnu/packages/rust.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 2942c5cb1f..25472fefb0 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -362,9 +362,15 @@ safety and thread safety guarantees.")
        (uri (rust-uri version))
        (sha256 (base32 "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"))
        (modules '((guix build utils)))
-       (snippet '(for-each delete-file-recursively
-                           '("src/llvm-project"
-                             "vendor/tikv-jemalloc-sys/jemalloc")))))
+       (snippet
+        '(begin
+           (for-each delete-file-recursively
+                     '("src/llvm-project"
+                       "vendor/tikv-jemalloc-sys/jemalloc"))
+           ;; Add support for riscv64-linux.
+           (substitute* "vendor/tikv-jemallocator/src/lib.rs"
+             (("    target_arch = \"s390x\"," all)
+              (string-append all "\n    target_arch = \"riscv64\",")))))))
     (outputs '("out" "cargo"))
     (properties '((timeout . 72000)           ;20 hours
                   (max-silent-time . 18000))) ;5 hours (for armel)



reply via email to

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