From: Ximin Luo <infinity0@debian.org>
Date: Sat, 4 Jan 2020 02:38:58 +0000 (+0000)
Subject: update architecture.mk for riscv64 / riscv64gc-unknown-linux-gnu
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0fa39c9dd140f8c365a10b2ecd1bc8b6ecd3b809;p=rustc.git

update architecture.mk for riscv64 / riscv64gc-unknown-linux-gnu
---

diff --git a/debian/architecture.mk b/debian/architecture.mk
index 9a71eb996a..dd027a13eb 100644
--- a/debian/architecture.mk
+++ b/debian/architecture.mk
@@ -3,9 +3,10 @@
 include /usr/share/dpkg/architecture.mk
 
 rust_cpu = $(subst i586,i686,\
+$(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\
 $(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\
 $(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\
-$(1))))
+$(1)))))
 rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
 
 $(foreach machine,BUILD HOST TARGET,\