diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-11 14:41:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-17 19:32:47 +0100 |
| commit | b965e8c538b30116a637d64da6e2bd6d54e50171 (patch) | |
| tree | c5150fe8f2b391c2cf7d36b999df0bf6092c5fcb | |
| parent | 57589bc497d518fc509cd8adb9407ea7984ec540 (diff) | |
| download | qemu-b965e8c538b30116a637d64da6e2bd6d54e50171.zip qemu-b965e8c538b30116a637d64da6e2bd6d54e50171.tar.gz qemu-b965e8c538b30116a637d64da6e2bd6d54e50171.tar.bz2 | |
build-sys: do not include Windows SLIRP dependencies in $LIBS
When including the internal SLIRP library, we should add all the libraries that
it needs for the build. Right now they are all included by QEMU, but -liphlpapi
is not needed without slirp. Move it from LIBS to slirp_libs.
Based on a patch by Marc-André Lureau.
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -925,7 +925,7 @@ if test "$mingw32" = "yes" ; then DSOSUF=".dll" # MinGW needs -mthreads for TLS and macro _MT. QEMU_CFLAGS="-mthreads $QEMU_CFLAGS" - LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS" + LIBS="-lwinmm -lws2_32 $LIBS" write_c_skeleton; if compile_prog "" "-liberty" ; then LIBS="-liberty $LIBS" @@ -6027,6 +6027,9 @@ case "$slirp" in mkdir -p slirp slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp" + if test "$mingw32" = "yes" ; then + slirp_libs="$slirp_libs -lws2_32 -liphlpapi" + fi ;; system) |