aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index afcafad3d7..142a21793b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
-LIBS+=-lz
+LIBS+=-lz $(LIBS_TOOLS)
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
diff --git a/configure b/configure
index 0d43812fb6..2f27a26fa7 100755
--- a/configure
+++ b/configure
@@ -46,6 +46,7 @@ objcopy="objcopy"
ld="ld"
helper_cflags=""
libs_softmmu=""
+libs_tools=""
audio_pt_int=""
# parse CC options first
@@ -1783,6 +1784,7 @@ echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
echo "LIBS+=$LIBS" >> $config_host_mak
+echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "/* Automatically generated by configure - do not modify */" > $config_host_h