summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2016-05-03 00:09:49 +0200
committerMichael Brown2016-05-03 00:09:49 +0200
commit9f91df422b9ec7f1db493ea2fe333d8e609b58f9 (patch)
tree223d4370645fdd54090bc576861a9808b66cee01
parent[efi] Eliminate use of libbfd (diff)
downloadipxe-9f91df422b9ec7f1db493ea2fe333d8e609b58f9.tar.gz
ipxe-9f91df422b9ec7f1db493ea2fe333d8e609b58f9.tar.xz
ipxe-9f91df422b9ec7f1db493ea2fe333d8e609b58f9.zip
[build] Remove unnecessary dependency on zlib
The dependency on zlib seems to have been introduced in commit 3dd7ce1 ("[efi] Allow building with non-system libbfd") as an indirect requirement of either libbfd or libiberty when building on Mac OS X. Since we no longer use either of these libraries, remove the unnecessary link against zlib. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/Makefile1
-rw-r--r--src/Makefile.housekeeping8
2 files changed, 2 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile
index b7becdb4..582ffe81 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -53,7 +53,6 @@ EINFO := ./util/einfo
GENKEYMAP := ./util/genkeymap.pl
DOXYGEN := doxygen
LCAB := lcab
-ZLIB_DIR := /usr
###############################################################################
#
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 4ba1421b..ceff8141 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -1303,19 +1303,15 @@ CLEANUP += $(ZBIN)
#
# The EFI image converter
#
-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_TARGET32 $< \
- $(ELF2EFI_LDFLAGS) -o $@
+ $(Q)$(HOST_CC) $(HOST_CFLAGS) -idirafter include -DEFI_TARGET32 $< -o $@
CLEANUP += $(ELF2EFI32)
$(ELF2EFI64) : util/elf2efi.c $(MAKEDEPS)
$(QM)$(ECHO) " [HOSTCC] $@"
- $(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET64 $< \
- $(ELF2EFI_LDFLAGS) -o $@
+ $(Q)$(HOST_CC) $(HOST_CFLAGS) -idirafter include -DEFI_TARGET64 $< -o $@
CLEANUP += $(ELF2EFI64)
$(EFIROM) : util/efirom.c $(MAKEDEPS)