Commit 0795ac9d authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[master] Removed linking with gtest in libdhcpsrvtest.

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.
parent 7cc8a92c
...@@ -5,10 +5,6 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) ...@@ -5,10 +5,6 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(KEA_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK
AM_LDFLAGS = -static
endif
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
if HAVE_GTEST if HAVE_GTEST
...@@ -26,7 +22,7 @@ libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) ...@@ -26,7 +22,7 @@ libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
if HAVE_MYSQL if HAVE_MYSQL
libdhcpsrvtest_la_CPPFLAGS += $(MYSQL_CPPFLAGS) libdhcpsrvtest_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
endif endif
libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_MYSQL if HAVE_MYSQL
libdhcpsrvtest_la_LDFLAGS += $(MYSQL_LIBS) libdhcpsrvtest_la_LDFLAGS += $(MYSQL_LIBS)
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment