瀏覽代碼

[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>
tags/v1.20.1
Michael Brown 9 年之前
父節點
當前提交
9f91df422b
共有 2 個檔案被更改,包括 2 行新增7 行删除
  1. 0
    1
      src/Makefile
  2. 2
    6
      src/Makefile.housekeeping

+ 0
- 1
src/Makefile 查看文件

53
 GENKEYMAP	:= ./util/genkeymap.pl
53
 GENKEYMAP	:= ./util/genkeymap.pl
54
 DOXYGEN		:= doxygen
54
 DOXYGEN		:= doxygen
55
 LCAB		:= lcab
55
 LCAB		:= lcab
56
-ZLIB_DIR	:= /usr
57
 
56
 
58
 ###############################################################################
57
 ###############################################################################
59
 #
58
 #

+ 2
- 6
src/Makefile.housekeeping 查看文件

1303
 #
1303
 #
1304
 # The EFI image converter
1304
 # The EFI image converter
1305
 #
1305
 #
1306
-ELF2EFI_CFLAGS	:= -I$(ZLIB_DIR)/include -idirafter include
1307
-ELF2EFI_LDFLAGS	:= -L$(ZLIB_DIR)/lib -lz -Wl,--no-warn-search-mismatch
1308
 
1306
 
1309
 $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)
1307
 $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)
1310
 	$(QM)$(ECHO) "  [HOSTCC] $@"
1308
 	$(QM)$(ECHO) "  [HOSTCC] $@"
1311
-	$(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET32 $< \
1312
-		$(ELF2EFI_LDFLAGS) -o $@
1309
+	$(Q)$(HOST_CC) $(HOST_CFLAGS) -idirafter include -DEFI_TARGET32 $< -o $@
1313
 CLEANUP += $(ELF2EFI32)
1310
 CLEANUP += $(ELF2EFI32)
1314
 
1311
 
1315
 $(ELF2EFI64) : util/elf2efi.c $(MAKEDEPS)
1312
 $(ELF2EFI64) : util/elf2efi.c $(MAKEDEPS)
1316
 	$(QM)$(ECHO) "  [HOSTCC] $@"
1313
 	$(QM)$(ECHO) "  [HOSTCC] $@"
1317
-	$(Q)$(HOST_CC) $(HOST_CFLAGS) $(ELF2EFI_CFLAGS) -DEFI_TARGET64 $< \
1318
-		$(ELF2EFI_LDFLAGS) -o $@
1314
+	$(Q)$(HOST_CC) $(HOST_CFLAGS) -idirafter include -DEFI_TARGET64 $< -o $@
1319
 CLEANUP += $(ELF2EFI64)
1315
 CLEANUP += $(ELF2EFI64)
1320
 
1316
 
1321
 $(EFIROM) : util/efirom.c $(MAKEDEPS)
1317
 $(EFIROM) : util/efirom.c $(MAKEDEPS)

Loading…
取消
儲存