summaryrefslogblamecommitdiff
path: root/bootstrap/rust-1.60/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch
blob: e55c1bffc8243acd2acaef6edb084a759e2b4358 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
                                                                      

                                          
                                                                         





                                                                                                                                    
                                     

                                                                

                 
               











                                                                  
      
 
From 5f08947cef0556245748e5a3d0b9d1da926939ff Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 6 Oct 2018 04:01:48 +0000
Subject: [PATCH 10/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 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.35.1