[PATCH 2/2][E] UBUNTU: [Debian] Don't use CROSS_COMPILE for i386 configs

[Seth Forshee]

BugLink: https://bugs.launchpad.net/bugs/1845714

Since i386 support is being removed in eoan, we will no longer
have cross toolchains to use when updating configs. Stop setting
CROSS_COMPILE for i386 so that the host toolchain will be used
instead.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian/scripts/misc/kernelconfig | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 9795f678a9db..9231fb1dfb2c 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -60,8 +60,13 @@ for arch in $archs; do
 	deb_host_arch=$(dpkg-architecture -qDEB_HOST_ARCH -a$arch 2>/dev/null)
 	[ $deb_build_arch != $deb_host_arch ] && cross_compile="$(dpkg-architecture -qDEB_HOST_GNU_TYPE -a$arch 2>/dev/null)-"
 
-	# Environment variables for 'make *config'
-	env="ARCH=$kernarch CROSS_COMPILE=$cross_compile"
+	# Environment variables for 'make *config'. We omit CROSS_COMPILE
+	# for i386 since it is no longer supported after 19.04, however
+	# we maintain the configs for hwe.
+	env="ARCH=$kernarch"
+	if [ "$arch" != "i386" ]; then
+		env="$env CROSS_COMPILE=$cross_compile"
+	fi
 
 	archconfdir=$confdir/$arch
 	flavourconfigs=$(cd $archconfdir && ls config.flavour.*)
-- 
2.20.1