summaryrefslogtreecommitdiffstats
path: root/debian/architecture.mk
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 18:32:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 18:32:18 +0000
commit6efd0735800a63d26445057972174dd809f9f3da (patch)
tree586f3ecee26715446b6275993964016322d2a002 /debian/architecture.mk
parentMerging upstream version 1.74.1+dfsg1. (diff)
downloadrustc-6efd0735800a63d26445057972174dd809f9f3da.tar.xz
rustc-6efd0735800a63d26445057972174dd809f9f3da.zip
Merging debian version 1.74.1+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/architecture.mk')
-rw-r--r--debian/architecture.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/architecture.mk b/debian/architecture.mk
index dd027a13e..bbf81eef0 100644
--- a/debian/architecture.mk
+++ b/debian/architecture.mk
@@ -7,7 +7,10 @@ $(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_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
+
+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))))