[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] configure: move common libraries to config-host
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 4/5] configure: move common libraries to config-host.mak |
Date: |
Tue, 2 Apr 2013 16:44:19 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.target | 2 +-
configure | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2bd6d14..c8513f1 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -119,7 +119,7 @@ obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o
obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o
obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
-LIBS+=-lz
+LIBS+=$(libs_softmmu)
# xen support
obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
diff --git a/configure b/configure
index 629f70b..da0e8aa 100755
--- a/configure
+++ b/configure
@@ -1455,6 +1455,7 @@ EOF
exit 1
fi
fi
+libs_softmmu="$libs_softmmu -lz"
##########################################
# libseccomp check
@@ -3479,6 +3480,7 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak
echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
+echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak
@@ -4192,7 +4194,7 @@ if test "$target_bigendian" = "yes" ; then
fi
if test "$target_softmmu" = "yes" ; then
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
+ echo "LIBS+=$target_libs_softmmu" >> $config_target_mak
case "$target_arch2" in
i386|x86_64)
echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
--
1.8.1.4
- [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, (continued)
- [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Paolo Bonzini, 2013/04/02
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Peter Maydell, 2013/04/02
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Paolo Bonzini, 2013/04/02
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Peter Maydell, 2013/04/02
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Paolo Bonzini, 2013/04/02
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Peter Maydell, 2013/04/02
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Paolo Bonzini, 2013/04/03
- Re: [Qemu-devel] [PATCH 1/5] configure: move TARGET_*_ALIGNMENT to target-*/cpu.h, Aurelien Jarno, 2013/04/02
[Qemu-devel] [PATCH 3/5] configure: move CONFIG_QEMU_LDST_OPTIMIZATION to config-host.mak, Paolo Bonzini, 2013/04/02
[Qemu-devel] [PATCH 4/5] configure: move common libraries to config-host.mak,
Paolo Bonzini <=
[Qemu-devel] [PATCH 2/5] cpu: default TARGET_LONG_ALIGNMENT to TARGET_LONG_SIZE, Paolo Bonzini, 2013/04/02
[Qemu-devel] [PATCH 5/5] configure: CONFIG_NO_XEN is duplicated, Paolo Bonzini, 2013/04/02