summaryrefslogtreecommitdiff
path: root/user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch
blob: 7d63cc1cceab7c4c87c34efe7890f7071925e112 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
From 8fbb4ae754fff3f4daa82ad222b3743aace0aa97 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 6 Oct 2018 04:01:48 +0000
Subject: [PATCH 18/23] 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 cc7bc176f4..36553f1e44 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 @@ SKIP_OS := 'FreeBSD OpenBSD Bitrig SunOS'
 
 ifneq ($(UNAME),$(findstring $(UNAME),$(SKIP_OS)))
 
-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.19.2