diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-07-02 12:13:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:45 +0200 |
| commit | 90f7b095500c712394f9cb2502c03701e30fdc0a (patch) | |
| tree | 34f96329100d8096b85dacf413d9d321807c5f1a /gnu | |
| parent | 7c702d7e47d588f682040769a02ea6b273c17f8f (diff) | |
| download | guix-90f7b095500c712394f9cb2502c03701e30fdc0a.tar.gz guix-90f7b095500c712394f9cb2502c03701e30fdc0a.zip | |
gnu: rust: Add 'bash' input for 'wrap-program'.
It is required for cross-compilation.
* gnu/packages/rust.scm
(rust-bootstrap)[inputs]: Add 'bash-minimal'.
(rust-1.55)[inputs]: Likewise.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I8f0f71b236504d6a2e04c5823fbf20f926485992
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/rust.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 465899fe9d..fa0c4e5854 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -36,6 +36,7 @@ (define-module (gnu packages rust) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) #:use-module (gnu packages cmake) @@ -185,7 +186,8 @@ (max-silent-time . 18000))) ;5 hours (for armel) (build-system gnu-build-system) (inputs - `(,@(if (or (target-ppc64le?) + `(("bash-minimal" ,bash-minimal) + ,@(if (or (target-ppc64le?) (target-riscv64?)) `(("clang" ,clang-13)) `()) @@ -539,7 +541,8 @@ ar = \"" binutils "/bin/ar" "\" ("rustc-bootstrap" ,rust-bootstrap) ("cargo-bootstrap" ,rust-bootstrap "cargo"))) (inputs - `(("llvm" ,llvm-13) + `(("bash" ,bash-minimal) + ("llvm" ,llvm-13) ("openssl" ,openssl))) ;; rustc invokes gcc, so we need to set its search paths accordingly. (native-search-paths |