From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 22 Sep 2019 12:14:14 +0000 (+0000)
Subject: Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
X-Git-Tag: archive/raspbian/1.39.0+dfsg1-4+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f8bdc9135beed85e25337460f61d84e3034897e3;p=rustc.git

Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
---

diff --git a/debian/architecture.mk b/debian/architecture.mk
index cb9dcc50bb..9cc517e77e 100644
--- a/debian/architecture.mk
+++ b/debian/architecture.mk
@@ -12,3 +12,5 @@ $(foreach machine,BUILD HOST TARGET,\
 ifeq ($(DEB_TARGET_RUST_TYPE),-unknown-)
   DEB_TARGET_RUST_TYPE = $(DEB_HOST_RUST_TYPE)
 endif
+
+DEB_BUILD_RUST_TYPE = $(shell dpkg -L rustc | grep '/usr/lib/rustlib/' | head -n 1 | cut -d '/' -f 5)
diff --git a/debian/changelog b/debian/changelog
index 517d6ec5fb..250036da4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ rustc (1.37.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
   * Build for armv6.
   [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
   * Disable testsuite.
+  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
+  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 
  -- Peter Micheal Green <plugwash@raspbian.org>  Tue, 17 Sep 2019 01:17:52 +0000