From: Viswanath Sivakumar Date: Tue, 13 Jan 2015 18:57:03 +0000 (-0800) Subject: Add libgtest to Makefile to unbreak OSS build X-Git-Tag: v0.22.0~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3178699dfc1ca33edf7d9a8706d96cce1259b2ed;p=folly.git Add libgtest to Makefile to unbreak OSS build Summary: SpookyHashTest now needs libgtestmain to be linked (https://phabricator.fb.com/D1775555). https://ci-builds.fb.com/job/folly/1570/console Test Plan: Don't have Ubuntu setup, but this should fix it. Will kick off jenkins build. Reviewed By: andrewjcg@fb.com Subscribers: folly-diffs@ FB internal diff: D1779604 Signature: t1:1779604:1421174608:de865529d728e943288b52c0d63ebb712eda094f Blame Revision: D1775555 --- diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index 85eee0db..f38b185d 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -175,11 +175,11 @@ cpuid_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la TESTS += cpuid_test spooky_hash_v1_test_SOURCES = SpookyHashV1Test.cpp -spooky_hash_v1_test_LDADD = $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la +spooky_hash_v1_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la TESTS += spooky_hash_v1_test spooky_hash_v2_test_SOURCES = SpookyHashV2Test.cpp -spooky_hash_v2_test_LDADD = $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la +spooky_hash_v2_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la TESTS += spooky_hash_v2_test check_PROGRAMS += $(TESTS)