diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
| commit | c30463643e0f18200197fa7fc700805eac4d020c (patch) | |
| tree | 599f32d5195512f7b700bb1f68abdbda7ee45281 /user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch | |
| parent | 3e7e0ccf80173731eef6d51f8a261b6058bfad72 (diff) | |
| parent | 3ad04696702c67ecbb84ee44d20b2489d77d841f (diff) | |
| download | packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.gz packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.bz2 packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.xz packages-c30463643e0f18200197fa7fc700805eac4d020c.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.31.1
This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/
See merge request !131
Diffstat (limited to 'user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch')
| -rw-r--r-- | user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..7d63cc1cc --- /dev/null +++ b/user/rust/0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,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 + |