From 8c66baa06cc28c7f9a529d84958716cea9d6fe97 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 4 Dec 2013 20:33:50 +0100
Subject: [PATCH] grub: force -m32 so we build grub 32 bits on 64 bits
 architecture

As reported by Matthew Weber, Grub doesn't build on 64 bits build
machines, because the host compiler produces 64 bits binaries by
default, while Grub should be built 32 bits. Therefore, this commit
passes -m32 to the Grub CFLAGS, so that 32 bits binaries are always
produced.

Reported-by: Matthew Weber <mlweber1@rockwellcollins.com>
Cc: Matthew Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by:  Matthew Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/grub/grub.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 6ba02cd503..eb066af76c 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -70,7 +70,7 @@ GRUB_POST_PATCH_HOOKS += GRUB_DEBIAN_PATCHES
 
 GRUB_CONF_ENV = \
 	$(HOST_CONFIGURE_OPTS) \
-	CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS)"
+	CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
 
 GRUB_CONF_OPT = \
 	--disable-auto-linux-mem-opt \
-- 
2.30.2