From a3787fedb8f0a2a920858a716390ea9aedb6ad35 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 9 Dec 2016 12:49:00 +0300 Subject: [PATCH] Fix building with -Wl,--as-needed linker option with older ld versions --- test/Makefile.am | 12 ++++++------ test/benchmark/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 82e8d68d..5a1ed720 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -38,14 +38,14 @@ noinst_HEADERS = \ regression/*.h unit_tests_LDADD = \ - $(GLOBAL_LDADD) \ $(top_builddir)/src/.libs/libmodsecurity.a \ $(CURL_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(PCRE_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \ - $(LIBXML2_LDADD) + $(LIBXML2_LDADD) \ + $(GLOBAL_LDADD) unit_tests_CPPFLAGS = \ @@ -74,14 +74,14 @@ regression_tests_SOURCES = \ regression/custom_debug_log.cc regression_tests_LDADD = \ - $(GLOBAL_LDADD) \ $(top_builddir)/src/.libs/libmodsecurity.a \ $(CURL_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(PCRE_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \ - $(LIBXML2_LDADD) + $(LIBXML2_LDADD) \ + $(GLOBAL_LDADD) regression_tests_CPPFLAGS = \ @@ -109,14 +109,14 @@ rules_optimization_SOURCES = \ optimization/optimization.cc rules_optimization_LDADD = \ - $(GLOBAL_LDADD) \ $(top_builddir)/src/.libs/libmodsecurity.a \ $(CURL_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(PCRE_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \ - $(LIBXML2_LDADD) + $(LIBXML2_LDADD) \ + $(GLOBAL_LDADD) rules_optimization_CPPFLAGS = \ diff --git a/test/benchmark/Makefile.am b/test/benchmark/Makefile.am index 370d802d..a3dc0d88 100644 --- a/test/benchmark/Makefile.am +++ b/test/benchmark/Makefile.am @@ -6,14 +6,14 @@ benchmark_SOURCES = \ benchmark.cc benchmark_LDADD = \ - $(GLOBAL_LDADD) \ $(top_builddir)/src/.libs/libmodsecurity.a \ $(CURL_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(PCRE_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \ - $(LIBXML2_LDADD) + $(LIBXML2_LDADD) \ + $(GLOBAL_LDADD) benchmark_CPPFLAGS = \ -std=c++11 \