nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: rust: Fix build for armhf and mips64el. 

This is a followup to commit 514026d7de.

* gnu/packages/rust.scm (nix-system->gnu-triplet-for-rust): New variable.
(rust-bootstrap, mrustc, rust-1.23): Use 'nix-system->gnu-triplet-for-rust'
instead of 'nix-system->gnu-triplet'.
This commit is contained in:
Mark H Weaver 2018-06-03 03:21:13 -04:00
parent 0ec430f795
commit 2c790226d2
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/rust.scm
View File

@ -59,6 +59,16 @@
(define %cargo-reference-hash (define %cargo-reference-hash
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
(define* (nix-system->gnu-triplet-for-rust
#:optional (system (%current-system)))
(match system
("x86_64-linux" "x86_64-unknown-linux-gnu")
("i686-linux" "i686-unknown-linux-gnu")
("armhf-linux" "armv7-unknown-linux-gnueabihf")
("aarch64-linux" "aarch64-unknown-linux-gnu")
("mips64el-linux" "mips64el-unknown-linux-gnuabi64")
(_ (nix-system->gnu-triplet system))))
(define rust-bootstrap (define rust-bootstrap
(package (package
(name "rust-bootstrap") (name "rust-bootstrap")
@ -76,10 +86,11 @@
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://static.rust-lang.org/dist/" "https://static.rust-lang.org/dist/"
"rust-" version "-" (nix-system->gnu-triplet) ".tar.gz")) "rust-" version "-" (nix-system->gnu-triplet-for-rust)
".tar.gz"))
(sha256 (sha256
(base32 (base32
(match (nix-system->gnu-triplet) (match (nix-system->gnu-triplet-for-rust)
("i686-unknown-linux-gnu" ("i686-unknown-linux-gnu"
"15zqbx86nm13d5vq2gm69b7av4vg479f74b5by64hs3bcwwm08pr") "15zqbx86nm13d5vq2gm69b7av4vg479f74b5by64hs3bcwwm08pr")
("x86_64-unknown-linux-gnu" ("x86_64-unknown-linux-gnu"
@ -119,7 +130,8 @@
(invoke "bash" "install.sh" (invoke "bash" "install.sh"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--components=rustc," (string-append "--components=rustc,"
"rust-std-" ,(nix-system->gnu-triplet))) "rust-std-"
,(nix-system->gnu-triplet-for-rust)))
;; Instal cargo ;; Instal cargo
(invoke "bash" "install.sh" (invoke "bash" "install.sh"
(string-append "--prefix=" cargo-out) (string-append "--prefix=" cargo-out)
@ -321,8 +333,7 @@ safety and thread safety guarantees.")
(("^RUSTC_TARGET := x86_64-unknown-linux-gnu") (("^RUSTC_TARGET := x86_64-unknown-linux-gnu")
(string-append "RUSTC_TARGET := " (string-append "RUSTC_TARGET := "
,(or (%current-target-system) ,(or (%current-target-system)
(nix-system->gnu-triplet (nix-system->gnu-triplet-for-rust)))))
(%current-system))))))
(invoke "tar" "xf" (assoc-ref inputs "rustc")) (invoke "tar" "xf" (assoc-ref inputs "rustc"))
(chdir "rustc-1.19.0-src") (chdir "rustc-1.19.0-src")
(invoke "patch" "-p0" "../rust_src.patch") (invoke "patch" "-p0" "../rust_src.patch")
@ -445,7 +456,7 @@ rpath = true
# codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs # codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs
# This tests required patched LLVM # This tests required patched LLVM
codegen-tests = false codegen-tests = false
[target." ,(nix-system->gnu-triplet) "] [target." ,(nix-system->gnu-triplet-for-rust) "]
llvm-config = \"" llvm "/bin/llvm-config" "\" llvm-config = \"" llvm "/bin/llvm-config" "\"
cc = \"" gcc "/bin/gcc" "\" cc = \"" gcc "/bin/gcc" "\"
cxx = \"" gcc "/bin/g++" "\" cxx = \"" gcc "/bin/g++" "\"