diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-17 16:26:44 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2013-04-18 14:12:31 +0200 |
| commit | f544a488e55d3c504b65b6209199a977df9b24b9 (patch) | |
| tree | a6fbf198311e474db0de43fbc266fd6d7d0328cf | |
| parent | 727e52838c709f542d4306849567bf3d8c64479e (diff) | |
| download | focaccia-qemu-f544a488e55d3c504b65b6209199a977df9b24b9.tar.gz focaccia-qemu-f544a488e55d3c504b65b6209199a977df9b24b9.zip | |
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>
| -rw-r--r-- | Makefile.target | 10 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index 2bd6d1471c..26361036bd 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 c274c5f08b..01d2b127fc 100755 --- a/configure +++ b/configure @@ -1467,6 +1467,7 @@ EOF "Make sure to have the zlib libs and headers installed." fi fi +libs_softmmu="$libs_softmmu -lz" ########################################## # libseccomp check @@ -3607,6 +3608,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 @@ -4331,7 +4333,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 |