bump version to 1.80.1+dfsg1-1~bpo12+pve1

[rustc.git] / debian / architecture.mk

diff --git a/debian/architecture.mk b/debian/architecture.mk
index daeda01b973418445cd2309c2b95eda9538918db..bbf81eef0514e730a190c9a921597a9fc16f24c7 100644 (file)
--- a/debian/architecture.mk
+++ b/debian/architecture.mk
@@ -2,8 +2,15 @@
 
 include /usr/share/dpkg/architecture.mk
 
-rust_cpu = $(subst i586,i686,$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),$(1)))
-rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
+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)))))
+
+rust_os = $(if $(findstring -hurd-,-$(2)-),$(subst gnu,hurd-gnu,$(1)),$1)
+
+rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$(call rust_os,$($(1)_GNU_SYSTEM),$($(1)_ARCH_OS))
 
 $(foreach machine,BUILD HOST TARGET,\
   $(eval $(call rust_type_setvar,DEB_$(machine))))