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/0008-test-use-extern-for-plugins-Don-t-assume-multilib.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/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch')
| -rw-r--r-- | user/rust/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/user/rust/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..0fefe38cc --- /dev/null +++ b/user/rust/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,30 @@ +From 6ad7add8f7dee0f6dac64add5d64098667a5168d Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sat, 6 Oct 2018 04:01:48 +0000 +Subject: [PATCH 08/13] test/use-extern-for-plugins: Don't assume multilib + +--- + src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +index 3976da3113..567a8d3157 100644 +--- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile ++++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +@@ -5,12 +5,7 @@ + # ignore-bitrig + # ignore-sunos + +-HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') +-ifeq ($(findstring i686,$(HOST)),i686) +-TARGET := $(subst i686,x86_64,$(HOST)) +-else +-TARGET := $(subst x86_64,i686,$(HOST)) +-endif ++TARGET := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') + + all: + $(RUSTC) foo.rs -C extra-filename=-host +-- +2.21.0 + |