From 7ff61b754950fa82d16e1bcbb458c54a38598f2a Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 5 Jul 2019 23:26:12 -0500 Subject: user/rust: Bump to 1.36.0 Signed-off-by: Samuel Holland --- ...-extern-for-plugins-Don-t-assume-multilib.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 user/rust/0007-test-use-extern-for-plugins-Don-t-assume-multilib.patch (limited to 'user/rust/0007-test-use-extern-for-plugins-Don-t-assume-multilib.patch') diff --git a/user/rust/0007-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0007-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..0655d8ac1 --- /dev/null +++ b/user/rust/0007-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,30 @@ +From 27dcf49a9a5a27c39b6f66837060bfa5d03ced50 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sat, 6 Oct 2018 04:01:48 +0000 +Subject: [PATCH 07/12] 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 838b1a2719b..94fa9f6d067 100644 +--- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile ++++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +@@ -4,12 +4,7 @@ + # ignore-openbsd + # 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 + -- cgit v1.2.3-60-g2f50