diff options
Diffstat (limited to 'bootstrap/rust-1.73/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch')
| -rw-r--r-- | bootstrap/rust-1.73/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/bootstrap/rust-1.73/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/bootstrap/rust-1.73/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..e3523d54d --- /dev/null +++ b/bootstrap/rust-1.73/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,27 @@ +From 1ce31f881d28900bb7f081599d4b0376f38097d2 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sat, 6 Oct 2018 04:01:48 +0000 +Subject: [PATCH 09/13] test/use-extern-for-plugins: Don't assume multilib + +--- + tests/run-make/use-extern-for-plugins/Makefile | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/tests/run-make/use-extern-for-plugins/Makefile b/tests/run-make/use-extern-for-plugins/Makefile +index b8ec7e8dcda90..be452b560035d 100644 +--- a/tests/run-make/use-extern-for-plugins/Makefile ++++ b/tests/run-make/use-extern-for-plugins/Makefile +@@ -4,12 +4,7 @@ include ../tools.mk + # ignore-openbsd + # ignore-solaris + +-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 |