From e03ce7ed85195107fce206c7390263ff9afeaece Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Sun, 21 Mar 2021 13:14:20 -0400 Subject: Fix cross-compilation from x86_64->i686 Signed-off-by: Peter Jones --- Make.defaults | 1 + Makefile | 4 ++-- gnu-efi | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Make.defaults b/Make.defaults index 495bf570..b7721547 100644 --- a/Make.defaults +++ b/Make.defaults @@ -4,6 +4,7 @@ COMPILER ?= gcc CC = $(CROSS_COMPILE)$(COMPILER) +HOSTCC = $(COMPILER) LD = $(CROSS_COMPILE)ld OBJCOPY = $(CROSS_COMPILE)objcopy DOS2UNIX ?= dos2unix diff --git a/Makefile b/Makefile index d1941828..b96858ff 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ lib/lib.a: | $(TOPDIR)/lib/Makefile $(wildcard $(TOPDIR)/include/*.[ch]) $(MAKE) VPATH=$(TOPDIR)/lib -C lib -f $(TOPDIR)/lib/Makefile lib.a buildid : $(TOPDIR)/buildid.c - $(CC) -Og -g3 -Wall -Werror -Wextra -o $@ $< -lelf + $(HOSTCC) -I/usr/include -Og -g3 -Wall -Werror -Wextra -o $@ $< -lelf $(BOOTCSVNAME) : @echo Making $@ @@ -334,5 +334,5 @@ archive: tag .PHONY : install-deps shim.key -export ARCH CC LD OBJCOPY EFI_INCLUDE EFI_INCLUDES OPTIMIZATIONS +export ARCH CC CROSS_COMPILE LD OBJCOPY EFI_INCLUDE EFI_INCLUDES OPTIMIZATIONS export FEATUREFLAGS WARNFLAGS WERRFLAGS diff --git a/gnu-efi b/gnu-efi index 5e07f70b..193ae1ae 160000 --- a/gnu-efi +++ b/gnu-efi @@ -1 +1 @@ -Subproject commit 5e07f70b08776e72fa1d081af56b8d5e636433c9 +Subproject commit 193ae1aeacd940ec3b48cc52f135f0695648a5f4 -- cgit v1.2.3