]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Removed linking with gtest in libdhcpsrvtest. trac4248_base trac4339_base
authorMarcin Siodelski <marcin@isc.org>
Fri, 18 Mar 2016 14:18:33 +0000 (15:18 +0100)
committerMarcin Siodelski <marcin@isc.org>
Fri, 18 Mar 2016 14:26:26 +0000 (15:26 +0100)
This change was okayed on jabber by Thomas. The issue
occurred when static linking was enabled on OSX.

Linking a static lib from statically linked lib causes
various issues and isn't generally considered a good
idea.

src/lib/dhcpsrv/testutils/Makefile.am

index 97ffcba62ce7f5b2674bb57d1bb37735bde02834..416056891a8d9408bb3163cd356f0789c33354d0 100644 (file)
@@ -5,10 +5,6 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
 CLEANFILES = *.gcno *.gcda
 
 if HAVE_GTEST
@@ -26,7 +22,7 @@ libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 if HAVE_MYSQL
 libdhcpsrvtest_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
 endif
-libdhcpsrvtest_la_LDFLAGS  = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+libdhcpsrvtest_la_LDFLAGS  = $(AM_LDFLAGS)
 if HAVE_MYSQL
 libdhcpsrvtest_la_LDFLAGS  += $(MYSQL_LIBS)
 endif