ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: move common libraries to config-host.mak 

Move -lm to the end of the line, so that it can be picked up as a
dependency by pixman in the static build case.

Reviewed-by: Peter Maydell <peter.maydell@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Paolo Bonzini 2013-04-17 16:26:44 +02:00 committed by Edgar E. Iglesias
parent 727e52838c
commit f544a488e5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.target
View File

@ -31,10 +31,6 @@ PROGS+=$(QEMU_PROGW)
endif endif
STPFILES= STPFILES=
ifndef CONFIG_HAIKU
LIBS+=-lm
endif
config-target.h: config-target.h-timestamp config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak 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_HAVE_CORE_DUMP) += dump.o
obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
LIBS+=-lz LIBS+=$(libs_softmmu)
# xen support # xen support
obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o 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 = $(obj-y)
all-obj-y += $(addprefix ../, $(common-obj-y)) all-obj-y += $(addprefix ../, $(common-obj-y))
ifndef CONFIG_HAIKU
LIBS+=-lm
endif
ifdef QEMU_PROGW ifdef QEMU_PROGW
# The linker builds a windows executable. Make also a console executable. # The linker builds a windows executable. Make also a console executable.
$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a $(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a

4
configure vendored
View File

@ -1467,6 +1467,7 @@ EOF
"Make sure to have the zlib libs and headers installed." "Make sure to have the zlib libs and headers installed."
fi fi
fi fi
libs_softmmu="$libs_softmmu -lz"
########################################## ##########################################
# libseccomp check # libseccomp check
@ -3607,6 +3608,7 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak
echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
echo "qemu_localedir=$qemu_localedir" >> $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 echo "ARCH=$ARCH" >> $config_host_mak
@ -4331,7 +4333,7 @@ if test "$target_bigendian" = "yes" ; then
fi fi
if test "$target_softmmu" = "yes" ; then if test "$target_softmmu" = "yes" ; then
echo "CONFIG_SOFTMMU=y" >> $config_target_mak 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 case "$target_arch2" in
i386|x86_64) i386|x86_64)
echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak