me
/
guix
Archived
1
0
Fork 0
Code

gnu: rust@1.25: Fix build on aarch64-linux. 

* gnu/packages/rust.scm (rust@1.25)[arguments]: Replace inherited custom
'patch-aarch64-test phase. Make sure all phases return #t.
master
Efraim Flashner 2018-07-15 21:49:21 +03:00
parent 4f963b6f29
commit 080e11b48e
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/rust.scm
View File

@ -554,14 +554,28 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'patch-cargo-tests 'patch-cargo-index-update (add-after 'patch-cargo-tests 'patch-cargo-index-update
(lambda* _ (lambda _
(substitute* "src/tools/cargo/tests/generate-lockfile.rs" (substitute* "src/tools/cargo/tests/generate-lockfile.rs"
;; This test wants to update the crate index. ;; This test wants to update the crate index.
(("fn no_index_update") "#[ignore]\nfn no_index_update")))) (("fn no_index_update") "#[ignore]\nfn no_index_update"))
#t))
(add-after 'configure 'enable-codegen-tests (add-after 'configure 'enable-codegen-tests
(lambda* _ (lambda _
(substitute* "config.toml" (substitute* "config.toml"
(("codegen-tests = false") "")))) (("codegen-tests = false") ""))
#t))
(replace 'patch-aarch64-test
(lambda _
(substitute* "src/librustc_metadata/dynamic_lib.rs"
;; This test is known to fail on aarch64 and powerpc64le:
;; https://github.com/rust-lang/rust/issues/45410
(("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine"))
;; This test fails on aarch64 with llvm@6.0:
;; https://github.com/rust-lang/rust/issues/49807
;; other possible solution:
;; https://github.com/rust-lang/rust/pull/47688
(delete-file "src/test/debuginfo/by-value-self-argument-in-trait-impl.rs")
#t))
(delete 'ignore-glibc-2.27-incompatible-test)))))))) (delete 'ignore-glibc-2.27-incompatible-test))))))))
(define-public rust-1.26 (define-public rust-1.26