summaryrefslogblamecommitdiff
path: root/user/rust/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch
blob: da9d25537dd23f9a2726f345b1300e5b3d5ac5cf (plain) (tree)
1
2
3
4
                                                                      

                                          
                                                                         























                                                                                                                                    
      
 
From b7fdd2b4b192e1ac7e59fe009e7b7bba8943c8dc 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/14] 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.21.0