diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-21 13:14:20 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-22 16:43:44 -0400 |
| commit | e03ce7ed85195107fce206c7390263ff9afeaece (patch) | |
| tree | e616a34f7d2b99f1648e2bbfd4261be4e48cbc35 | |
| parent | 5c1a3013095c9d18932fb13bf08fa1548fd79d83 (diff) | |
| download | efi-boot-shim-e03ce7ed85195107fce206c7390263ff9afeaece.tar.gz efi-boot-shim-e03ce7ed85195107fce206c7390263ff9afeaece.zip | |
Fix cross-compilation from x86_64->i686
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | Make.defaults | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| m--------- | gnu-efi | 0 |
3 files changed, 3 insertions, 2 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 @@ -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 -Subproject 5e07f70b08776e72fa1d081af56b8d5e636433c +Subproject 193ae1aeacd940ec3b48cc52f135f0695648a5f |