[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/10] configure: move common libraries to config
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 09/10] configure: move common libraries to config-host.mak |
Date: |
Wed, 3 Apr 2013 12:32:07 +0200 |
Move -lm to the end of the line, so that it can be picked up as a
dependency by pixman.
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.target | 10 +++++-----
configure | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2bd6d14..2636103 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -31,10 +31,6 @@ PROGS+=$(QEMU_PROGW)
endif
STPFILES=
-ifndef CONFIG_HAIKU
-LIBS+=-lm
-endif
-
config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak
@@ -119,7 +115,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
@@ -149,6 +145,10 @@ include $(SRC_PATH)/Makefile.objs
all-obj-y = $(obj-y)
all-obj-y += $(addprefix ../, $(common-obj-y))
+ifndef CONFIG_HAIKU
+LIBS+=-lm
+endif
+
ifdef QEMU_PROGW
# The linker builds a windows executable. Make also a console executable.
$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
diff --git a/configure b/configure
index 7d83600..c8d47fe 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
@@ -4190,7 +4192,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
- Re: [Qemu-devel] [PATCH v2 06/10] elfload: only give abi_long/ulong the alignment specified by the target, (continued)
[Qemu-devel] [PATCH v2 07/10] elfload: use abi_llong/ullong instead of target_llong/ullong, Paolo Bonzini, 2013/04/03
[Qemu-devel] [PATCH v2 08/10] configure: move CONFIG_QEMU_LDST_OPTIMIZATION to config-host.mak, Paolo Bonzini, 2013/04/03
[Qemu-devel] [PATCH v2 05/10] elfload: use abi_int/uint instead of target_int/uint, Paolo Bonzini, 2013/04/03
[Qemu-devel] [PATCH v2 09/10] configure: move common libraries to config-host.mak,
Paolo Bonzini <=
[Qemu-devel] [PATCH v2 10/10] configure: CONFIG_NO_XEN is duplicated, Paolo Bonzini, 2013/04/03