diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-30 04:27:44 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch) | |
| tree | 2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch | |
| parent | 04e62b2391dc7f829349c87e1cc71597731e3c88 (diff) | |
| download | packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2 packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip | |
user/rust: Bump to 1.60.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch')
| -rw-r--r-- | user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..e55c1bffc --- /dev/null +++ b/user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,30 @@ +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 + |