summaryrefslogtreecommitdiffstats
path: root/src/Makefile.housekeeping
diff options
context:
space:
mode:
authorMichael Brown2016-05-02 21:36:54 +0200
committerMichael Brown2016-05-02 23:35:14 +0200
commitefd5cf9aadcaf36f45db5d1c3059197a8479567c (patch)
tree7143d562a4dd2fee56e9e5561f4840b0ca1a6b1e /src/Makefile.housekeeping
parent[librm] Preserve FPU, MMX and SSE state across calls to virt_call() (diff)
downloadipxe-efd5cf9aadcaf36f45db5d1c3059197a8479567c.tar.gz
ipxe-efd5cf9aadcaf36f45db5d1c3059197a8479567c.tar.xz
ipxe-efd5cf9aadcaf36f45db5d1c3059197a8479567c.zip
[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 <mcb30@ipxe.org>
Diffstat (limited to 'src/Makefile.housekeeping')
-rw-r--r--src/Makefile.housekeeping10
1 files changed, 4 insertions, 6 deletions
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)