diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-01 23:06:05 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-01 23:06:05 +0000 |
| commit | fc8a8c07a6a2d4497783d92264a2cf2036161867 (patch) | |
| tree | 9c51aee789895949855774f104f0bd202a18148d /user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | |
| parent | 413cf17ca5808b6f2c897486ac2787580d64dd8e (diff) | |
| parent | 7e1cca3044a2ec11b12b1e0004eb59be38950bed (diff) | |
| download | packages-fc8a8c07a6a2d4497783d92264a2cf2036161867.tar.gz packages-fc8a8c07a6a2d4497783d92264a2cf2036161867.tar.bz2 packages-fc8a8c07a6a2d4497783d92264a2cf2036161867.tar.xz packages-fc8a8c07a6a2d4497783d92264a2cf2036161867.zip | |
Merge branch 'rust' into 'master'
Rust bump
Builds on pmmx/x86_64/ppc64/aarch64. Successfully builds Firefox.
Still fails 17 tests on ppc32, but the ICE has been fixed:
```
[run-make] run-make-fulldeps/exit-code
[run-make] run-make-fulldeps/extern-fn-generic
[run-make] run-make-fulldeps/extern-fn-struct-passing-abi
[run-make] run-make-fulldeps/extern-fn-with-packed-struct
[run-make] run-make-fulldeps/extern-fn-with-union
[run-make] run-make-fulldeps/issue-25581
[run-make] run-make-fulldeps/relocation-model
[run-pass] run-pass/extern/extern-pass-TwoU16s.rs
[run-pass] run-pass/extern/extern-pass-TwoU32s.rs
[run-pass] run-pass/extern/extern-pass-TwoU64s.rs
[run-pass] run-pass/extern/extern-pass-TwoU8s.rs
[run-pass] run-pass/extern/extern-pass-empty.rs
[run-pass] run-pass/foreign/foreign-fn-with-byval.rs
[run-pass] run-pass/issues/issue-28676.rs
[run-pass] run-pass/structs-enums/struct-return.rs
[run-pass] run-pass/threads-sendsync/thread-local-extern-static.rs
[run-pass] run-pass/union/union-c-interop.rs
```
See merge request !232
Diffstat (limited to 'user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch')
| -rw-r--r-- | user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..3c0bc7c5e --- /dev/null +++ b/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,25 @@ +From fb4844f8b8a546873b909490b66bde24772e4cc7 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 09/13] test/sysroot-crates-are-unstable: Fix test when rpath + is disabled + +Without this environment var, the test can't run rustc to find +the sysroot path. +--- + .../run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index a35174b3c2..9e77070685 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,4 @@ ++-include ../tools.mk ++ + all: +- python2.7 test.py ++ env '$(HOST_RPATH_ENV)' python2.7 test.py +-- +2.21.0 + |