From 0a0da5299f9dfc424c7af64e0948575866429452 Mon Sep 17 00:00:00 2001 From: Guobao Sun Date: Mon, 19 Dec 2016 19:19:45 -0800 Subject: [PATCH] Fix library name for thread_local_test in open source builds Summary: Test case ThreadLocal.SharedLibrary is failing due to looking for "thread_local_test_lib.so", while the actual .so generated is "lib_thread_local_test.so". Change Makefile.am to conform it. Reviewed By: Orvid Differential Revision: D4350758 fbshipit-source-id: 9a2a23325059ed71529821620398ffa6ed84f83e --- folly/test/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index a35455e1..e082dbb3 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -18,7 +18,7 @@ TESTS= \ check_LTLIBRARIES = libfollytestmain.la libgtest.la check_PROGRAMS = -noinst_LTLIBRARIES = lib_thread_local_test.la +noinst_LTLIBRARIES = thread_local_test_lib.la libgtest_la_CPPFLAGS = -Igtest-1.7.0 -Igtest-1.7.0/src libgtest_la_SOURCES = gtest-1.7.0/src/gtest-all.cc @@ -33,10 +33,10 @@ libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) gtest-1.7.0/src/gtest_main. libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la endif -lib_thread_local_test_la_CPPFLAGS = $(AM_CPPFLAGS) -lib_thread_local_test_la_SOURCES = ThreadLocalTestLib.cpp -lib_thread_local_test_la_LDFLAGS = -rpath /force_shared -lib_thread_local_test_la_LIBADD = $(top_builddir)/libfolly.la +thread_local_test_lib_la_CPPFLAGS = $(AM_CPPFLAGS) +thread_local_test_lib_la_SOURCES = ThreadLocalTestLib.cpp +thread_local_test_lib_la_LDFLAGS = -module -rpath /force_shared +thread_local_test_lib_la_LIBADD = $(top_builddir)/libfolly.la noinst_HEADERS = FBStringTestBenchmarks.cpp.h \ FBVectorTestBenchmarks.cpp.h -- 2.34.1