Permalink
Browse files

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
  • Loading branch information...
1 parent 6dca2b3 commit dcf79b80f522f1a6482b426d65829b1d033e794a @andrewjcg andrewjcg committed with tudor Jul 9, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 folly/Makefile.am
  2. +2 −2 folly/test/Makefile.am
View
@@ -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
View
@@ -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

0 comments on commit dcf79b8

Please sign in to comment.