diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:32:50 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:32:50 +0000 |
| commit | 99162e025d3b7323de9deb3992feb4be7fdb2587 (patch) | |
| tree | 748dbd1630f96ba68d77eaee1f2cd708f00c5b4d /user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch | |
| parent | 032d4ce8dfbf86b3d18d9d91aec917b5824f1aad (diff) | |
| parent | 3febb3d8330926d97e865c3aeaddff95acef8b83 (diff) | |
| download | packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.gz packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.bz2 packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.xz packages-99162e025d3b7323de9deb3992feb4be7fdb2587.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.38.0
See merge request adelie/packages!365
Diffstat (limited to 'user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch')
| -rw-r--r-- | user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..9dacfaf10 --- /dev/null +++ b/user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,30 @@ +From cdc3d5f2aebc0e5ae06f9e5d8ddeb279e0fd494b Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sat, 6 Oct 2018 04:01:48 +0000 +Subject: [PATCH 13/18] 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 + |