UBUNTU: [Debian] Disable SPL/ZFS for cross compiling -- redux

Signed-off-by: Andy Whitcroft <apw@canonical.com>

debian/rules

@@ -40,6 +40,7 @@ do_tools_common=true
 # Don't build tools in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
 	do_tools=false
+	do_zfs=false
 endif
 
 # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap

debian/rules.d/0-common-vars.mk

@@ -107,13 +107,6 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)-
 endif
 
-#
-# The SPL/ZFS config is not cross compile smart yet.
-#
-ifneq ($(CROSS_COMPILE),)
-	do_zfs = false
-endif
-
 abidir		:= $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch)
 prev_abidir	:= $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch)
 commonconfdir	:= $(CURDIR)/$(DEBIAN)/config