From efd5cf9aadcaf36f45db5d1c3059197a8479567c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 2 May 2016 20:36:54 +0100 Subject: [efi] Eliminate use of libbfd Parse the intermediate ELF file directly instead of using libbfd, in order to allow for cross-compiled ELF objects. As a side bonus, this eliminates libbfd as a build requirement. Signed-off-by: Michael Brown --- src/Makefile.housekeeping | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/Makefile.housekeeping') diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 4280f398..4ba1421b 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -1303,20 +1303,18 @@ CLEANUP += $(ZBIN) # # The EFI image converter # -ELF2EFI_CFLAGS := -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \ - -I$(ZLIB_DIR)/include -idirafter include -ELF2EFI_LDFLAGS := -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib -L$(ZLIB_DIR)/lib \ - -lbfd -ldl -lz -Wl,--no-warn-search-mismatch +ELF2EFI_CFLAGS := -I$(ZLIB_DIR)/include -idirafter include +ELF2EFI_LDFLAGS := -L$(ZLIB_DIR)/lib -lz -Wl,--no-warn-search-mismatch $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS) $(QM)$(ECHO) " [HOSTCC] $@" - $(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET_IA32 $< \ + $(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET32 $< \ $(ELF2EFI_LDFLAGS) -o $@ CLEANUP += $(ELF2EFI32) $(ELF2EFI64) : util/elf2efi.c $(MAKEDEPS) $(QM)$(ECHO) " [HOSTCC] $@" - $(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET_X64 $< \ + $(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET64 $< \ $(ELF2EFI_LDFLAGS) -o $@ CLEANUP += $(ELF2EFI64) -- cgit v1.2.3-55-g7522