From 2c14106a02e666ca4d59ba2f2c200d2728af8f99 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 8 Dec 2016 14:12:18 +0100 Subject: [PATCH] configure: move version script check to one place Signed-off-by: Pavel Hrdina --- configure.ac | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index f7c9f50541..db9c5b1379 100644 --- a/configure.ac +++ b/configure.ac @@ -153,10 +153,23 @@ AC_MSG_RESULT([$LIBVIRT_NODELETE]) AC_SUBST([LIBVIRT_NODELETE]) AC_MSG_CHECKING([for how to set DSO symbol versions]) -VERSION_SCRIPT_FLAGS=-Wl,--version-script= -`$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ - VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," +case "$host" in + *-*-mingw* | *-*-msvc* ) + # mingw's ld has the --version-script parameter, but it requires a .def file + # instead to work properly, therefore clear --version-script here and use + # -Wl, to pass the .def file to the linker + # cygwin's ld has the --version-script parameter too, but for some reason + # it's working there as expected + VERSION_SCRIPT_FLAGS="-Wl," + ;; + * ) + VERSION_SCRIPT_FLAGS=-Wl,--version-script= + `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ + VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," + ;; +esac AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) +AC_SUBST([VERSION_SCRIPT_FLAGS]) dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case dnl we're working on BSD) @@ -1646,19 +1659,6 @@ LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES -case "$host" in - *-*-mingw* | *-*-msvc* ) - # mingw's ld has the --version-script parameter, but it requires a .def file - # instead to work properly, therefore clear --version-script here and use - # -Wl, to pass the .def file to the linker - # cygwin's ld has the --version-script parameter too, but for some reason - # it's working there as expected - VERSION_SCRIPT_FLAGS="-Wl," - ;; -esac -AC_SUBST([VERSION_SCRIPT_FLAGS]) - - dnl Driver-Modules library support LIBVIRT_ARG_DRIVER_MODULES LIBVIRT_CHECK_DRIVER_MODULES -- GitLab