On 3/26/20 1:25 PM, Richard W.M. Jones wrote:
The dummy library can be compiled this way on all platforms since it
doesn't rely on external undefined symbols.
Reverts commit ba000b469c24ad69604137de975b255bbe70d056.
---
configure.ac | 9 ---------
tests/Makefile.am | 6 +-----
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0a0ac60a..92e0d4e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -412,15 +412,6 @@ AS_CASE([$host_os],
AC_MSG_RESULT([$SHARED_LDFLAGS])
AC_SUBST([SHARED_LDFLAGS])
-AC_MSG_CHECKING([if we are on a windows platform])
-AS_CASE([$host_os],
- [mingw*|msys*|cygwin*], [is_windows=yes],
- [is_windows=no]
-)
-AC_MSG_RESULT([$is_windows])
We may end up adding that in later (but here's hoping we don't have to).
-AM_CONDITIONAL([WINDOWS],
- [test "x$is_windows" = "xyes"])
-
AC_SEARCH_LIBS([getaddrinfo], [network socket])
dnl Check for SELinux socket labelling (optional).
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 562558d0..f9c6b8ad 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -833,13 +833,9 @@ libvixDiskLib_la_CXXFLAGS = $(WARNINGS_CFLAGS)
# For use of the -rpath option, see:
#
https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
libvixDiskLib_la_LDFLAGS = \
- -shared -version-number 6:0:0 -rpath /nowhere \
+ -shared -version-number 6:0:0 -no-undefined -rpath /nowhere \
$(NULL)
-if WINDOWS
-libvixDiskLib_la_LDFLAGS += -no-undefined
-endif
-
ACK.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization:
qemu.org |
libvirt.org