diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-10-11 06:07:46 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-10-11 06:07:46 +0000 |
| commit | 11597b8939720fb5246c41482d873bce2ef8235e (patch) | |
| tree | 5e68deee8c43ec66acf35f8eca89f5cc71ff81d7 /user/rust/0024-test-use-extern-for-plugins-Don-t-assume-multilib.patch | |
| parent | 3c5a215212a76932481c316d1259f4dc15c061fa (diff) | |
| parent | 2323b0da26e293bb4d5a7a4ad8afed85a599d11d (diff) | |
| download | packages-11597b8939720fb5246c41482d873bce2ef8235e.tar.gz packages-11597b8939720fb5246c41482d873bce2ef8235e.tar.bz2 packages-11597b8939720fb5246c41482d873bce2ef8235e.tar.xz packages-11597b8939720fb5246c41482d873bce2ef8235e.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.29.1 plus fixes for i586, ppc32
See merge request !85
Diffstat (limited to 'user/rust/0024-test-use-extern-for-plugins-Don-t-assume-multilib.patch')
| -rw-r--r-- | user/rust/0024-test-use-extern-for-plugins-Don-t-assume-multilib.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/user/rust/0024-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0024-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..c033bb558 --- /dev/null +++ b/user/rust/0024-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,30 @@ +From 0fbfd4524768afad009e8e94c8824adfd7bd3b00 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sat, 6 Oct 2018 04:01:48 +0000 +Subject: [PATCH 24/29] 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.18.0 + |