Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.

diff --git a/debian/architecture.mk b/debian/architecture.mk
index cb9dcc50bb577744b5df6baab734dbd5c3d0ce14..9cc517e77e03b01ea63f735aa371644d6535b041 100644 (file)
--- 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 517d6ec5fbd6541b60882c66a4f375c9cacafd19..250036da4f463fc86c8c304829f9395839facc75 100644 (file)
--- 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