Commit dcf79b80 authored by Andrew Gallagher's avatar Andrew Gallagher Committed by Tudor Bosman

folly: fix build on ubuntu and fedora platforms

Summary:
A boost regex dependency wasn't added to the Makefile.am file.  Also
the it appears that boost thread lib dependencies had a typo in the
makefile variable name.

Test Plan: ran builds on ubunutu and fedora VMs

Reviewed By: tudorb@fb.com

FB internal diff: D514039
parent 6dca2b32
......@@ -107,7 +107,7 @@ libfolly_la_SOURCES = \
FormatTables.cpp \
String.cpp
libfolly_la_LIBADD = $(BOOST_THREAD_LIBS) -lpthread
libfolly_la_LIBADD = $(BOOST_THREAD_LIB) -lpthread
FingerprintTables.cpp: generate_fingerprint_tables
./generate_fingerprint_tables
......@@ -117,7 +117,7 @@ libfollyfingerprint_la_SOURCES = \
libfollyfingerprint_la_LIBADD = libfolly.la
libfollybenchmark_la_SOURCES = Benchmark.cpp
libfollybenchmark_la_LIBADD = -lrt libfolly.la
libfollybenchmark_la_LIBADD = $(BOOST_REGEX_LIB) -lrt libfolly.la
libfollytimeout_queue_la_SOURCES = TimeoutQueue.cpp
libfollytimeout_queue_la_LIBADD = libfolly.la
......
......@@ -114,7 +114,7 @@ endian_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
TESTS += endian_test
rw_spinlock_test_SOURCES = RWSpinLockTest.cpp
rw_spinlock_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la $(BOOST_THREAD_LIBS)
rw_spinlock_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la $(BOOST_THREAD_LIB)
TESTS += rw_spinlock_test
synchronized_test_SOURCES = SynchronizedTest.cpp
......@@ -126,7 +126,7 @@ concurrent_skiplist_test_LDADD = libgtest.la $(top_builddir)/libfolly.la
TESTS += concurrent_skiplist_test
concurrent_skiplist_benchmark_SOURCES = ConcurrentSkipListBenchmark.cpp
concurrent_skiplist_benchmark_LDADD = $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la $(BOOST_THREAD_LIBS)
concurrent_skiplist_benchmark_LDADD = $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
noinst_PROGRAMS += concurrent_skiplist_benchmark
histogram_test_SOURCES = HistogramTest.cpp
......
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