ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust: Add 'bash' input for 'wrap-program'.

Browse source 
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
This commit is contained in:
Maxime Devos 2021-07-02 12:13:24 +02:00 committed by Ludovic Courtès
parent 7c702d7e47
commit 90f7b09550
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/rust.scm
View file

@ -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 @@ (define-public rust-bootstrap
(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 @@ (define-public rust-1.55
("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