diff mbox

grub: force -m32 so we build grub 32 bits on 64 bits architecture

Message ID 1386185630-23338-1-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Commit 8c66baa06cc28c7f9a529d84958716cea9d6fe97
Headers show

Commit Message

Thomas Petazzoni Dec. 4, 2013, 7:33 p.m. UTC
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>
---
 boot/grub/grub.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Baruch Siach Dec. 4, 2013, 7:39 p.m. UTC | #1
Hi Thomas,

On Wed, Dec 04, 2013 at 08:33:50PM +0100, Thomas Petazzoni wrote:
> 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>

For some reason Matthew does not appear on the Cc list. Added now. Shouldn't 
git send-email do this automatically?

baruch

> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.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 6ba02cd..eb066af 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 \
> -- 
> 1.8.1.2
Matt Weber Dec. 4, 2013, 7:43 p.m. UTC | #2
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote on 12/04/2013 
01:33:50 PM:

> From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> To: buildroot@uclibc.org
> Cc: Matthew Weber <mlweber1@rockwellcollins.com>
> Date: 12/04/2013 01:33 PM
> 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>

Thanks Thomas!


> ---
>  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 6ba02cd..eb066af 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 \
> -- 
> 1.8.1.2
>
Peter Korsgaard Dec. 4, 2013, 9:04 p.m. UTC | #3
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > 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>

Committed, thanks.
diff mbox

Patch

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 6ba02cd..eb066af 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 \