summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-05-26 12:08:13 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-05-27 21:50:54 (GMT)
commit85e3090a92e13b7afc426cb2d9189bbe8d2adaf4 (patch)
tree1d12f2053c914add2a191998715f00828dd53d85
parent0170b420c4d72daf6dc08b49b856bdb3e88e4a2a (diff)
downloadbuildroot-85e3090a92e13b7afc426cb2d9189bbe8d2adaf4.tar.gz
buildroot-85e3090a92e13b7afc426cb2d9189bbe8d2adaf4.tar.bz2
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>
-rw-r--r--toolchain/elf2flt/elf2flt.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 134034b..52e199c 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -19,7 +19,7 @@ $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
$(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
(cd $(ELF2FLT_DIR); rm -rf config.cache; \
- LDFLAGS=-lz \
+ LDFLAGS="$(HOST_LDFLAGS) -lz" \
$(ELF2FLT_DIR)/configure $(QUIET) \
--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
--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) 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:
rm -rf $(ELF2FLT_SOURCE)