mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 22:11:59 -09:00
elf2flt: fix build when zlib is not installed on the host
For a reason that's fairly unclear to me, Peter added a '-lz' link
flag to the elf2flt.mk build in d5664ee99 ("elf2flt: fix link").
However, the zlib library may not necessarily be installed on the host
machine, so we should depend on host-zlib, and pass the appropriate
LDFLAGS. This is what this patch does.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
committed by
Peter Korsgaard
parent
0170b420c4
commit
85e3090a92
@@ -19,7 +19,7 @@ $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
|
|||||||
|
|
||||||
$(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
|
$(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
|
||||||
(cd $(ELF2FLT_DIR); rm -rf config.cache; \
|
(cd $(ELF2FLT_DIR); rm -rf config.cache; \
|
||||||
LDFLAGS=-lz \
|
LDFLAGS="$(HOST_LDFLAGS) -lz" \
|
||||||
$(ELF2FLT_DIR)/configure $(QUIET) \
|
$(ELF2FLT_DIR)/configure $(QUIET) \
|
||||||
--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
|
--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
|
||||||
--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
|
--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
|
||||||
@@ -33,7 +33,7 @@ $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured
|
|||||||
$(MAKE) -C $(ELF2FLT_DIR) all
|
$(MAKE) -C $(ELF2FLT_DIR) all
|
||||||
$(MAKE) -C $(ELF2FLT_DIR) install
|
$(MAKE) -C $(ELF2FLT_DIR) install
|
||||||
|
|
||||||
elf2flt: uclibc_target uclibc-configured binutils gcc $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
|
elf2flt: uclibc_target uclibc-configured binutils gcc host-zlib $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
|
||||||
|
|
||||||
elf2flt-clean:
|
elf2flt-clean:
|
||||||
rm -rf $(ELF2FLT_SOURCE)
|
rm -rf $(ELF2FLT_SOURCE)
|
||||||
|
|||||||
Reference in New Issue
Block a user