From 8f3922a3c7b5a7bb3e1d66f5db5b4e90f8825fb7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 21:59:06 +0000 Subject: [PATCH] Fix architecture filtering to use DEB_HOST_ARCH not DEB_BUILD_ARCH Should make cross-builds work properly. --- debian/rules.d/tools/hv/Makefile | 2 +- debian/rules.real | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules.d/tools/hv/Makefile b/debian/rules.d/tools/hv/Makefile index 339a8b1ab..3393517f5 100644 --- a/debian/rules.d/tools/hv/Makefile +++ b/debian/rules.d/tools/hv/Makefile @@ -1,4 +1,4 @@ -ifeq ($(filter i386 amd64 x32,$(DEB_BUILD_ARCH)),) +ifeq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),) # Build nothing include $(top_rulesdir)/Makefile.inc diff --git a/debian/rules.real b/debian/rules.real index 52833514c..9bcea29f6 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -8,10 +8,10 @@ define submake endef binary-arch: install-kbuild install-usbip install-liblockdep install-cpupower -ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) +ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),) binary-arch: install-perf endif -ifneq ($(filter i386 amd64 x32,$(DEB_BUILD_ARCH)),) +ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),) binary-arch: install-hyperv-daemons endif