[Libguestfs] [PATCH nbdkit 7/9] Revert "build: Add -no-undefined flag when linking plugins on mingw."

Richard W.M. Jones rjones at redhat.com
Thu Mar 26 18:25:32 UTC 2020 

This reverts commit 6e088df4baa7737f120f854afbff5305e2dc1d6c.
---
 configure.ac                     |  9 ---------
 filters/blocksize/Makefile.am    |  2 +-
 filters/cache/Makefile.am        |  2 +-
 filters/cacheextents/Makefile.am |  2 +-
 filters/cow/Makefile.am          |  2 +-
 filters/delay/Makefile.am        |  2 +-
 filters/error/Makefile.am        |  2 +-
 filters/exitlast/Makefile.am     |  2 +-
 filters/ext2/Makefile.am         |  2 +-
 filters/extentlist/Makefile.am   |  2 +-
 filters/fua/Makefile.am          |  2 +-
 filters/ip/Makefile.am           |  2 +-
 filters/limit/Makefile.am        |  2 +-
 filters/log/Makefile.am          |  2 +-
 filters/nocache/Makefile.am      |  2 +-
 filters/noextents/Makefile.am    |  2 +-
 filters/nofilter/Makefile.am     |  2 +-
 filters/noparallel/Makefile.am   |  2 +-
 filters/nozero/Makefile.am       |  2 +-
 filters/offset/Makefile.am       |  2 +-
 filters/partition/Makefile.am    |  2 +-
 filters/rate/Makefile.am         |  2 +-
 filters/readahead/Makefile.am    |  2 +-
 filters/retry/Makefile.am        |  2 +-
 filters/stats/Makefile.am        |  2 +-
 filters/truncate/Makefile.am     |  2 +-
 filters/xz/Makefile.am           |  2 +-
 plugins/curl/Makefile.am         |  2 +-
 plugins/data/Makefile.am         |  2 +-
 plugins/eval/Makefile.am         |  2 +-
 plugins/example1/Makefile.am     |  2 +-
 plugins/example2/Makefile.am     |  2 +-
 plugins/example3/Makefile.am     |  2 +-
 plugins/ext2/Makefile.am         |  2 +-
 plugins/file/Makefile.am         |  2 +-
 plugins/floppy/Makefile.am       |  2 +-
 plugins/full/Makefile.am         |  2 +-
 plugins/guestfs/Makefile.am      |  2 +-
 plugins/gzip/Makefile.am         |  2 +-
 plugins/info/Makefile.am         |  2 +-
 plugins/iso/Makefile.am          |  2 +-
 plugins/libvirt/Makefile.am      |  2 +-
 plugins/linuxdisk/Makefile.am    |  2 +-
 plugins/lua/Makefile.am          |  2 +-
 plugins/memory/Makefile.am       |  2 +-
 plugins/nbd/Makefile.am          |  2 +-
 plugins/null/Makefile.am         |  2 +-
 plugins/partitioning/Makefile.am |  2 +-
 plugins/pattern/Makefile.am      |  2 +-
 plugins/perl/Makefile.am         |  2 +-
 plugins/python/Makefile.am       |  2 +-
 plugins/random/Makefile.am       |  2 +-
 plugins/ruby/Makefile.am         |  2 +-
 plugins/sh/Makefile.am           |  2 +-
 plugins/split/Makefile.am        |  2 +-
 plugins/ssh/Makefile.am          |  2 +-
 plugins/streaming/Makefile.am    |  2 +-
 plugins/tcl/Makefile.am          |  2 +-
 plugins/tmpdisk/Makefile.am      |  2 +-
 plugins/vddk/Makefile.am         |  2 +-
 plugins/zero/Makefile.am         |  2 +-
 tests/Makefile.am                | 18 +++++++++---------
 62 files changed, 69 insertions(+), 78 deletions(-)

diff --git a/configure.ac b/configure.ac
index bf720cec..02cb0839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,15 +403,6 @@ LIBS="$DL_LIBS $LIBS"
 AC_CHECK_FUNCS([dladdr])
 LIBS="$old_LIBS"
 
-dnl On mingw we should enable the -no-undefined flag.
-AC_MSG_CHECKING([SHARED_LDFLAGS])
-AS_CASE([$host_os],
-    [mingw*|msys*|cygwin*], [SHARED_LDFLAGS="$SHARED_LDFLAGS -no-undefined"],
-    []
-)
-AC_MSG_RESULT([$SHARED_LDFLAGS])
-AC_SUBST([SHARED_LDFLAGS])
-
 AC_SEARCH_LIBS([getaddrinfo], [network socket])
 
 dnl Check for SELinux socket labelling (optional).
diff --git a/filters/blocksize/Makefile.am b/filters/blocksize/Makefile.am
index 54a09bdb..25d6513b 100644
--- a/filters/blocksize/Makefile.am
+++ b/filters/blocksize/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_blocksize_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_blocksize_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_blocksize_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/cache/Makefile.am b/filters/cache/Makefile.am
index 6aa1f7e3..6496df07 100644
--- a/filters/cache/Makefile.am
+++ b/filters/cache/Makefile.am
@@ -55,7 +55,7 @@ nbdkit_cache_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_cache_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_cache_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_cache_filter_la_LIBADD = \
diff --git a/filters/cacheextents/Makefile.am b/filters/cacheextents/Makefile.am
index 10d9463d..bd0f47a8 100644
--- a/filters/cacheextents/Makefile.am
+++ b/filters/cacheextents/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_cacheextents_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_cacheextents_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_cacheextents_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_cacheextents_filter_la_LIBADD = \
diff --git a/filters/cow/Makefile.am b/filters/cow/Makefile.am
index 2a1fb51a..39532c82 100644
--- a/filters/cow/Makefile.am
+++ b/filters/cow/Makefile.am
@@ -50,7 +50,7 @@ nbdkit_cow_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_cow_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_cow_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_cow_filter_la_LIBADD = \
diff --git a/filters/delay/Makefile.am b/filters/delay/Makefile.am
index 59bf64be..1b70b11e 100644
--- a/filters/delay/Makefile.am
+++ b/filters/delay/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_delay_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_delay_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_delay_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/error/Makefile.am b/filters/error/Makefile.am
index 6b13a693..3a5aecb5 100644
--- a/filters/error/Makefile.am
+++ b/filters/error/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_error_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_error_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_error_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_error_filter_la_LIBADD = \
diff --git a/filters/exitlast/Makefile.am b/filters/exitlast/Makefile.am
index 84f29502..690008f1 100644
--- a/filters/exitlast/Makefile.am
+++ b/filters/exitlast/Makefile.am
@@ -43,7 +43,7 @@ nbdkit_exitlast_filter_la_SOURCES = \
 nbdkit_exitlast_filter_la_CPPFLAGS = -I$(top_srcdir)/include
 nbdkit_exitlast_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_exitlast_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/ext2/Makefile.am b/filters/ext2/Makefile.am
index ff60a421..1fb7ede5 100644
--- a/filters/ext2/Makefile.am
+++ b/filters/ext2/Makefile.am
@@ -57,7 +57,7 @@ nbdkit_ext2_filter_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_ext2_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/extentlist/Makefile.am b/filters/extentlist/Makefile.am
index dc52ee63..88a9afe1 100644
--- a/filters/extentlist/Makefile.am
+++ b/filters/extentlist/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_extentlist_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_extentlist_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_extentlist_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_extentlist_filter_la_LIBADD = \
diff --git a/filters/fua/Makefile.am b/filters/fua/Makefile.am
index fa478679..ef249efa 100644
--- a/filters/fua/Makefile.am
+++ b/filters/fua/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_fua_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_fua_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_fua_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/ip/Makefile.am b/filters/ip/Makefile.am
index 5f6aa2e8..81842a2e 100644
--- a/filters/ip/Makefile.am
+++ b/filters/ip/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_ip_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_ip_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_ip_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_ip_filter_la_LIBADD = \
diff --git a/filters/limit/Makefile.am b/filters/limit/Makefile.am
index 63e6b176..14d53ec4 100644
--- a/filters/limit/Makefile.am
+++ b/filters/limit/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_limit_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_limit_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_limit_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_limit_filter_la_LIBADD = \
diff --git a/filters/log/Makefile.am b/filters/log/Makefile.am
index 8c0c8da1..f0762cc0 100644
--- a/filters/log/Makefile.am
+++ b/filters/log/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_log_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_log_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_log_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_log_filter_la_LIBADD = \
diff --git a/filters/nocache/Makefile.am b/filters/nocache/Makefile.am
index 21cbb316..68fefdf4 100644
--- a/filters/nocache/Makefile.am
+++ b/filters/nocache/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_nocache_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_nocache_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_nocache_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/noextents/Makefile.am b/filters/noextents/Makefile.am
index 46a01861..8e4f905d 100644
--- a/filters/noextents/Makefile.am
+++ b/filters/noextents/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_noextents_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_noextents_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_noextents_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/nofilter/Makefile.am b/filters/nofilter/Makefile.am
index bf8ca907..8fb18ffd 100644
--- a/filters/nofilter/Makefile.am
+++ b/filters/nofilter/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_nofilter_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_nofilter_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_nofilter_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/noparallel/Makefile.am b/filters/noparallel/Makefile.am
index b246605f..ac15c609 100644
--- a/filters/noparallel/Makefile.am
+++ b/filters/noparallel/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_noparallel_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_noparallel_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_noparallel_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/nozero/Makefile.am b/filters/nozero/Makefile.am
index 45344a68..9b8fbeb1 100644
--- a/filters/nozero/Makefile.am
+++ b/filters/nozero/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_nozero_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_nozero_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_nozero_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/offset/Makefile.am b/filters/offset/Makefile.am
index 987cd497..70d89c98 100644
--- a/filters/offset/Makefile.am
+++ b/filters/offset/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_offset_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_offset_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_offset_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_offset_filter_la_LIBADD = \
diff --git a/filters/partition/Makefile.am b/filters/partition/Makefile.am
index 774608b7..0f95d429 100644
--- a/filters/partition/Makefile.am
+++ b/filters/partition/Makefile.am
@@ -51,7 +51,7 @@ nbdkit_partition_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_partition_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_partition_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_partition_filter_la_LIBADD = \
diff --git a/filters/rate/Makefile.am b/filters/rate/Makefile.am
index b392279f..4e749de4 100644
--- a/filters/rate/Makefile.am
+++ b/filters/rate/Makefile.am
@@ -52,7 +52,7 @@ nbdkit_rate_filter_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_rate_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/filters/readahead/Makefile.am b/filters/readahead/Makefile.am
index 491a349d..96fc822c 100644
--- a/filters/readahead/Makefile.am
+++ b/filters/readahead/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_readahead_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_readahead_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_readahead_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_readahead_filter_la_LIBADD = \
diff --git a/filters/retry/Makefile.am b/filters/retry/Makefile.am
index 13af1026..86011bb9 100644
--- a/filters/retry/Makefile.am
+++ b/filters/retry/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_retry_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_retry_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_retry_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_retry_filter_la_LIBADD = \
diff --git a/filters/stats/Makefile.am b/filters/stats/Makefile.am
index 520b41f3..0c16ded6 100644
--- a/filters/stats/Makefile.am
+++ b/filters/stats/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_stats_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_stats_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_stats_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_stats_filter_la_LIBADD = \
diff --git a/filters/truncate/Makefile.am b/filters/truncate/Makefile.am
index d79c2306..38e2047c 100644
--- a/filters/truncate/Makefile.am
+++ b/filters/truncate/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_truncate_filter_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_truncate_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_truncate_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 nbdkit_truncate_filter_la_LIBADD = \
diff --git a/filters/xz/Makefile.am b/filters/xz/Makefile.am
index 7391d0a3..3ba9765d 100644
--- a/filters/xz/Makefile.am
+++ b/filters/xz/Makefile.am
@@ -59,7 +59,7 @@ nbdkit_xz_filter_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_xz_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/filters/filters.syms \
 	$(NULL)
 
diff --git a/plugins/curl/Makefile.am b/plugins/curl/Makefile.am
index d9d7d440..6595eb95 100644
--- a/plugins/curl/Makefile.am
+++ b/plugins/curl/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_curl_plugin_la_LIBADD = \
 	$(CURL_LIBS) \
 	$(NULL)
 nbdkit_curl_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/data/Makefile.am b/plugins/data/Makefile.am
index 5fa45ae3..45121bac 100644
--- a/plugins/data/Makefile.am
+++ b/plugins/data/Makefile.am
@@ -56,7 +56,7 @@ nbdkit_data_plugin_la_CFLAGS = \
 	$(GNUTLS_CFLAGS) \
 	$(NULL)
 nbdkit_data_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_data_plugin_la_LIBADD = \
diff --git a/plugins/eval/Makefile.am b/plugins/eval/Makefile.am
index bc5eec64..cfe5541c 100644
--- a/plugins/eval/Makefile.am
+++ b/plugins/eval/Makefile.am
@@ -67,7 +67,7 @@ nbdkit_eval_plugin_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_eval_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/example1/Makefile.am b/plugins/example1/Makefile.am
index c09808b8..c557d3c8 100644
--- a/plugins/example1/Makefile.am
+++ b/plugins/example1/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_example1_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_example1_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_example1_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/example2/Makefile.am b/plugins/example2/Makefile.am
index 908e7625..ebd95377 100644
--- a/plugins/example2/Makefile.am
+++ b/plugins/example2/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_example2_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_example2_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_example2_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/example3/Makefile.am b/plugins/example3/Makefile.am
index b9bc6bc2..bdf6db3c 100644
--- a/plugins/example3/Makefile.am
+++ b/plugins/example3/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_example3_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_example3_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_example3_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/ext2/Makefile.am b/plugins/ext2/Makefile.am
index 8e8616ce..bb799af0 100644
--- a/plugins/ext2/Makefile.am
+++ b/plugins/ext2/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_ext2_plugin_la_LIBADD = \
 	$(EXT2FS_LIBS) $(COM_ERR_LIBS) \
 	$(NULL)
 nbdkit_ext2_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/file/Makefile.am b/plugins/file/Makefile.am
index 7fc40cf4..d0372b3c 100644
--- a/plugins/file/Makefile.am
+++ b/plugins/file/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_file_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_file_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_file_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_file_plugin_la_LIBADD = \
diff --git a/plugins/floppy/Makefile.am b/plugins/floppy/Makefile.am
index 6865e8ee..4ae12e75 100644
--- a/plugins/floppy/Makefile.am
+++ b/plugins/floppy/Makefile.am
@@ -54,7 +54,7 @@ nbdkit_floppy_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_floppy_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_floppy_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_floppy_plugin_la_LIBADD = \
diff --git a/plugins/full/Makefile.am b/plugins/full/Makefile.am
index b4e76bfc..b168439e 100644
--- a/plugins/full/Makefile.am
+++ b/plugins/full/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_full_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_full_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_full_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/guestfs/Makefile.am b/plugins/guestfs/Makefile.am
index 70d627cd..f07db5d2 100644
--- a/plugins/guestfs/Makefile.am
+++ b/plugins/guestfs/Makefile.am
@@ -55,7 +55,7 @@ nbdkit_guestfs_plugin_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_guestfs_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/gzip/Makefile.am b/plugins/gzip/Makefile.am
index 4577f17d..18c3d16b 100644
--- a/plugins/gzip/Makefile.am
+++ b/plugins/gzip/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_gzip_plugin_la_LIBADD = \
 	$(ZLIB_LIBS) \
 	$(NULL)
 nbdkit_gzip_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/info/Makefile.am b/plugins/info/Makefile.am
index f12e8465..442753be 100644
--- a/plugins/info/Makefile.am
+++ b/plugins/info/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_info_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_info_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_info_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_info_plugin_la_LIBADD = \
diff --git a/plugins/iso/Makefile.am b/plugins/iso/Makefile.am
index a0fd337a..69f452c6 100644
--- a/plugins/iso/Makefile.am
+++ b/plugins/iso/Makefile.am
@@ -49,7 +49,7 @@ nbdkit_iso_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_iso_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_iso_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_iso_plugin_la_LIBADD = \
diff --git a/plugins/libvirt/Makefile.am b/plugins/libvirt/Makefile.am
index 719c3bce..a7a78875 100644
--- a/plugins/libvirt/Makefile.am
+++ b/plugins/libvirt/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_libvirt_plugin_la_LIBADD = \
 	$(LIBVIRT_LIBS) \
 	$(NULL)
 nbdkit_libvirt_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/linuxdisk/Makefile.am b/plugins/linuxdisk/Makefile.am
index efe2bc2f..c05a92ad 100644
--- a/plugins/linuxdisk/Makefile.am
+++ b/plugins/linuxdisk/Makefile.am
@@ -60,7 +60,7 @@ nbdkit_linuxdisk_plugin_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_linuxdisk_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/lua/Makefile.am b/plugins/lua/Makefile.am
index a54d1edf..99b32beb 100644
--- a/plugins/lua/Makefile.am
+++ b/plugins/lua/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_lua_plugin_la_CFLAGS = \
 	$(LUA_CFLAGS) \
 	$(NULL)
 nbdkit_lua_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(LUA_LIBS) \
 	$(NULL)
diff --git a/plugins/memory/Makefile.am b/plugins/memory/Makefile.am
index 701c7f2f..029f3f84 100644
--- a/plugins/memory/Makefile.am
+++ b/plugins/memory/Makefile.am
@@ -47,7 +47,7 @@ nbdkit_memory_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_memory_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_memory_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_memory_plugin_la_LIBADD = \
diff --git a/plugins/nbd/Makefile.am b/plugins/nbd/Makefile.am
index 45b3ad88..4f6def32 100644
--- a/plugins/nbd/Makefile.am
+++ b/plugins/nbd/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_nbd_plugin_la_CFLAGS = \
 	$(LIBNBD_CFLAGS) \
 	$(NULL)
 nbdkit_nbd_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_nbd_plugin_la_LIBADD = \
diff --git a/plugins/null/Makefile.am b/plugins/null/Makefile.am
index 9788912b..a75fbb9f 100644
--- a/plugins/null/Makefile.am
+++ b/plugins/null/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_null_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_null_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_null_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/partitioning/Makefile.am b/plugins/partitioning/Makefile.am
index 93211382..c6c32671 100644
--- a/plugins/partitioning/Makefile.am
+++ b/plugins/partitioning/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_partitioning_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_partitioning_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_partitioning_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_partitioning_plugin_la_LIBADD = \
diff --git a/plugins/pattern/Makefile.am b/plugins/pattern/Makefile.am
index d4e55cfb..600861e3 100644
--- a/plugins/pattern/Makefile.am
+++ b/plugins/pattern/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_pattern_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_pattern_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_pattern_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/perl/Makefile.am b/plugins/perl/Makefile.am
index e8918440..a9a07de0 100644
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -58,7 +58,7 @@ nbdkit_perl_plugin_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_perl_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(PERL_LDOPTS) \
 	$(NULL)
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index bd400822..b99c5912 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -59,7 +59,7 @@ nbdkit_python_plugin_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_python_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(PYTHON_LDFLAGS) \
 	$(NULL)
diff --git a/plugins/random/Makefile.am b/plugins/random/Makefile.am
index f414e416..4371e197 100644
--- a/plugins/random/Makefile.am
+++ b/plugins/random/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_random_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_random_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_random_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/ruby/Makefile.am b/plugins/ruby/Makefile.am
index 3ee3cf4d..bf519cbc 100644
--- a/plugins/ruby/Makefile.am
+++ b/plugins/ruby/Makefile.am
@@ -56,7 +56,7 @@ nbdkit_ruby_plugin_la_LIBADD = \
 	$(RUBY_LIBS) \
 	$(NULL)
 nbdkit_ruby_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(RUBY_LDFLAGS) \
 	$(NULL)
diff --git a/plugins/sh/Makefile.am b/plugins/sh/Makefile.am
index 712c491e..5963e3f6 100644
--- a/plugins/sh/Makefile.am
+++ b/plugins/sh/Makefile.am
@@ -57,7 +57,7 @@ nbdkit_sh_plugin_la_LIBADD = \
 	$(top_builddir)/common/utils/libutils.la \
 	$(NULL)
 nbdkit_sh_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/split/Makefile.am b/plugins/split/Makefile.am
index d8218b9a..ceff3494 100644
--- a/plugins/split/Makefile.am
+++ b/plugins/split/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_split_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_split_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_split_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_split_plugin_la_LIBADD = \
diff --git a/plugins/ssh/Makefile.am b/plugins/ssh/Makefile.am
index f217154c..0b0f140d 100644
--- a/plugins/ssh/Makefile.am
+++ b/plugins/ssh/Makefile.am
@@ -54,7 +54,7 @@ nbdkit_ssh_plugin_la_LIBADD = \
 	$(SSH_LIBS) \
 	$(NULL)
 nbdkit_ssh_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/streaming/Makefile.am b/plugins/streaming/Makefile.am
index 275bca43..eece24c3 100644
--- a/plugins/streaming/Makefile.am
+++ b/plugins/streaming/Makefile.am
@@ -45,7 +45,7 @@ nbdkit_streaming_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_streaming_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_streaming_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/tcl/Makefile.am b/plugins/tcl/Makefile.am
index 8b8489db..3b057245 100644
--- a/plugins/tcl/Makefile.am
+++ b/plugins/tcl/Makefile.am
@@ -53,7 +53,7 @@ nbdkit_tcl_plugin_la_CFLAGS = \
 	$(TCL_CFLAGS) \
 	$(NULL)
 nbdkit_tcl_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(TCL_LIBS) \
 	$(NULL)
diff --git a/plugins/tmpdisk/Makefile.am b/plugins/tmpdisk/Makefile.am
index 34061771..2e487e92 100644
--- a/plugins/tmpdisk/Makefile.am
+++ b/plugins/tmpdisk/Makefile.am
@@ -46,7 +46,7 @@ nbdkit_tmpdisk_plugin_la_CPPFLAGS = \
 	$(NULL)
 nbdkit_tmpdisk_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_tmpdisk_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 nbdkit_tmpdisk_plugin_la_LIBADD = \
diff --git a/plugins/vddk/Makefile.am b/plugins/vddk/Makefile.am
index 4785e96c..b806a7d9 100644
--- a/plugins/vddk/Makefile.am
+++ b/plugins/vddk/Makefile.am
@@ -59,7 +59,7 @@ nbdkit_vddk_plugin_la_LIBADD = \
 	$(DL_LIBS) \
 	$(NULL)
 nbdkit_vddk_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/plugins/zero/Makefile.am b/plugins/zero/Makefile.am
index 5480a473..38cb270c 100644
--- a/plugins/zero/Makefile.am
+++ b/plugins/zero/Makefile.am
@@ -44,7 +44,7 @@ nbdkit_zero_plugin_la_CPPFLAGS = \
 	-I$(top_srcdir)/include
 nbdkit_zero_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 nbdkit_zero_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) \
+	-module -avoid-version -shared \
 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
 	$(NULL)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 901dca7e..8622440c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -302,7 +302,7 @@ test_flush_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_flush_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 # check_LTLIBRARIES won't build a shared library (see automake manual).
@@ -321,7 +321,7 @@ test_shutdown_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_shutdown_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 endif HAVE_PLUGINS
@@ -403,7 +403,7 @@ test_ansi_c_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_ansi_c_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 endif CAN_TEST_ANSI_C
 
@@ -429,7 +429,7 @@ test_cxx_plugin_la_CXXFLAGS = $(WARNINGS_CFLAGS)
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_cxx_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 test_cxx_filter_la_SOURCES = \
@@ -443,7 +443,7 @@ test_cxx_filter_la_CXXFLAGS = $(WARNINGS_CFLAGS)
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_cxx_filter_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 endif HAVE_CXX
 
@@ -1054,7 +1054,7 @@ test_layers_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_layers_plugin_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 test_layers_filter1_la_SOURCES = \
@@ -1066,7 +1066,7 @@ test_layers_filter1_la_CFLAGS = $(WARNINGS_CFLAGS) -Dlayer='"filter1"'
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_layers_filter1_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 test_layers_filter2_la_SOURCES = \
@@ -1078,7 +1078,7 @@ test_layers_filter2_la_CFLAGS = $(WARNINGS_CFLAGS) -Dlayer='"filter2"'
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_layers_filter2_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 test_layers_filter3_la_SOURCES = \
@@ -1090,7 +1090,7 @@ test_layers_filter3_la_CFLAGS = $(WARNINGS_CFLAGS) -Dlayer='"filter3"'
 # For use of the -rpath option, see:
 # https://lists.gnu.org/archive/html/libtool/2007-07/msg00067.html
 test_layers_filter3_la_LDFLAGS = \
-	-module -avoid-version -shared $(SHARED_LDFLAGS) -rpath /nowhere \
+	-module -avoid-version -shared -rpath /nowhere \
 	$(NULL)
 
 # blocksize filter test.
-- 
2.25.0

More information about the Libguestfs mailing list