guix-commits
[Top][All Lists]
Advanced

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

02/16: gnu: rust-1.74: Fix build on riscv64-linux.


From: guix-commits
Subject: 02/16: gnu: rust-1.74: Fix build on riscv64-linux.
Date: Tue, 23 Jan 2024 09:35:34 -0500 (EST)

efraim pushed a commit to branch rust-team
in repository guix.

commit 45926aac0c3bf0666b74a85aca0600195aa3f6f8
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Jan 23 14:01:45 2024 +0200

    gnu: rust-1.74: Fix build on riscv64-linux.
    
    * gnu/packages/rust.scm (rust-1.74)[arguments]: When building for
    riscv64-linux delete 'revert-riscv-pause-instruction phase.
    
    Change-Id: I59120e8dae995fca52b192b07e265db20d9281e7
---
 gnu/packages/rust.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 42be029c28..164404111e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -926,7 +926,15 @@ safety and thread safety guarantees.")
              ;; Adjust vendored dependency to explicitly use rustix with libc 
backend.
              (substitute* "vendor/tempfile/Cargo.toml"
                (("features = \\[\"fs\"" all)
-                (string-append all ", \"use-libc\""))))))))))
+                (string-append all ", \"use-libc\"")))))))
+      (arguments
+       (if (target-riscv64?)
+         (substitute-keyword-arguments (package-arguments base-rust)
+           ((#:phases phases)
+            `(modify-phases ,phases
+               ;; This phase is no longer needed.
+               (delete 'revert-riscv-pause-instruction))))
+         (package-arguments base-rust))))))
 
 (define rust-1.75
   (let ((base-rust (rust-bootstrapped-package rust-1.74 "1.75.0"



reply via email to

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