summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2019-02-10 21:10:48 -0800
committerSteve Langasek <steve.langasek@canonical.com>2019-02-10 21:10:48 -0800
commit1d945f769047a2a430f4bf2486532ca7d19fbd0d (patch)
treefa05dfeada040a0c5f6fda455617a1afe252bbb6
parent21efb35cce375d55be127133dc9c20fff97b7a0f (diff)
downloadefi-boot-shim-1d945f769047a2a430f4bf2486532ca7d19fbd0d.tar.gz
efi-boot-shim-1d945f769047a2a430f4bf2486532ca7d19fbd0d.zip
Ensure DEB_HOST_ARCH is set even if not present in the environment.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1a3a082b..1d642cbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ shim (15+1533136590.3beb971-2) UNRELEASED; urgency=medium
* Update VCS to point to salsa.
* Fix debian/rules syntax for arm64 build.
* Enable build for i386.
+ * Ensure DEB_HOST_ARCH is set even if not present in the environment.
-- Steve Langasek <vorlon@debian.org> Sun, 10 Feb 2019 00:15:19 -0800
diff --git a/debian/rules b/debian/rules
index a75c1d17..37df25ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,8 @@ else
distributor=debian
endif
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
ifeq ($(DEB_HOST_ARCH),amd64)
export EFI_ARCH := x64
endif