From 7baa115a33ab516c85ac94f6c5cdaee73e65ddf8 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 28 Aug 2012 16:24:09 +0100 Subject: build: export filtered -lz flag in config.mak This is needed to link tools/cws2fws using a linker with non-standard command line syntax. Signed-off-by: Mans Rullgard --- Makefile | 2 +- configure | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c49e38171e..b766e6d00d 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ all: $(PROGS) $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS) -tools/cws2fws$(EXESUF): ELIBS = -lz +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) config.h: .config .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) diff --git a/configure b/configure index 06bcc1cc7c..32118d0140 100755 --- a/configure +++ b/configure @@ -3561,6 +3561,7 @@ TARGET_EXEC=$target_exec TARGET_PATH=$target_path LIBS-avplay=$sdl_libs CFLAGS-avplay=$sdl_cflags +ZLIB=$($ldflags_filter -lz) LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD EXTRALIBS=$extralibs INSTALL=install -- cgit v1.2.3