diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 13:37:58 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 13:37:58 +0200 |
| commit | 2817ac3c18c1b1a6291c052bc61edd0947890a82 (patch) | |
| tree | 9985705b35274ae1d6655be789346a98beff63de /gnu/packages/rust.scm | |
| parent | ecd13016517f0113016fef090782b725fd5e80ce (diff) | |
| parent | 3e12df7d71547b4eca718b6b0e1fc244722dcc39 (diff) | |
| download | guix-2817ac3c18c1b1a6291c052bc61edd0947890a82.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b053bdce62..74de6f3ae1 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -200,7 +200,7 @@ in turn be used to build the final Rust.") ("rustc" ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) (arguments - `(#:tests? #f + `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" (assoc-ref %build-inputs "llvm") "/bin/llvm-config")) @@ -250,6 +250,7 @@ in turn be used to build the final Rust.") (gcc (assoc-ref inputs "gcc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) + (delete-file-recursively "output/local_tests") (mkdir-p lib) (copy-recursively "output" lib/rust) (mkdir-p bin) @@ -410,6 +411,8 @@ test = { path = \"../libtest\" } "output/rustc-build/rustc" "-C" (string-append "linker=" (getenv "CC")) + ;; Required for libterm. + "-Z" "force-unstable-if-unmarked" "-L" "output/target-libs" (string-append "src/" name "/lib.rs") "-o" @@ -429,7 +432,13 @@ test = { path = \"../libtest\" } ("libpanic_unwind") ;; Uses "cc" to link. ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") - ("libarena"))) + ("libarena") + + ;; Test dependencies: + + ("libgetopts") + ("libterm") + ("libtest"))) #t))) ;; This phase is overridden by newer versions. (replace 'check @@ -790,8 +799,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust (let ((base-rust - (rust-bootstrapped-package rust-1.26 "1.27.0" - "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c" + (rust-bootstrapped-package rust-1.26 "1.27.2" + "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs" #:patches '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" |