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/packages/rust.scm | |
| parent | 7c702d7e47d588f682040769a02ea6b273c17f8f (diff) | |
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/packages/rust.scm')
| -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 465899fe9d9..fa0c4e58544 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | (define-module (gnu packages rust) | 37 | (define-module (gnu packages rust) |
| 38 | #:use-module (gnu packages base) | 38 | #:use-module (gnu packages base) |
| 39 | #:use-module (gnu packages bash) | ||
| 39 | #:use-module (gnu packages bison) | 40 | #:use-module (gnu packages bison) |
| 40 | #:use-module (gnu packages bootstrap) | 41 | #:use-module (gnu packages bootstrap) |
| 41 | #:use-module (gnu packages cmake) | 42 | #:use-module (gnu packages cmake) |
| @@ -185,7 +186,8 @@ | |||
| 185 | (max-silent-time . 18000))) ;5 hours (for armel) | 186 | (max-silent-time . 18000))) ;5 hours (for armel) |
| 186 | (build-system gnu-build-system) | 187 | (build-system gnu-build-system) |
| 187 | (inputs | 188 | (inputs |
| 188 | `(,@(if (or (target-ppc64le?) | 189 | `(("bash-minimal" ,bash-minimal) |
| 190 | ,@(if (or (target-ppc64le?) | ||
| 189 | (target-riscv64?)) | 191 | (target-riscv64?)) |
| 190 | `(("clang" ,clang-13)) | 192 | `(("clang" ,clang-13)) |
| 191 | `()) | 193 | `()) |
| @@ -539,7 +541,8 @@ ar = \"" binutils "/bin/ar" "\" | |||
| 539 | ("rustc-bootstrap" ,rust-bootstrap) | 541 | ("rustc-bootstrap" ,rust-bootstrap) |
| 540 | ("cargo-bootstrap" ,rust-bootstrap "cargo"))) | 542 | ("cargo-bootstrap" ,rust-bootstrap "cargo"))) |
| 541 | (inputs | 543 | (inputs |
| 542 | `(("llvm" ,llvm-13) | 544 | `(("bash" ,bash-minimal) |
| 545 | ("llvm" ,llvm-13) | ||
| 543 | ("openssl" ,openssl))) | 546 | ("openssl" ,openssl))) |
| 544 | ;; rustc invokes gcc, so we need to set its search paths accordingly. | 547 | ;; rustc invokes gcc, so we need to set its search paths accordingly. |
| 545 | (native-search-paths | 548 | (native-search-paths |
