Commit 0a0da529 authored by Guobao Sun's avatar Guobao Sun Committed by Facebook Github Bot

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
parent 9589f4c4
...@@ -18,7 +18,7 @@ TESTS= \ ...@@ -18,7 +18,7 @@ TESTS= \
check_LTLIBRARIES = libfollytestmain.la libgtest.la check_LTLIBRARIES = libfollytestmain.la libgtest.la
check_PROGRAMS = 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_CPPFLAGS = -Igtest-1.7.0 -Igtest-1.7.0/src
libgtest_la_SOURCES = gtest-1.7.0/src/gtest-all.cc 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. ...@@ -33,10 +33,10 @@ libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) gtest-1.7.0/src/gtest_main.
libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la
endif endif
lib_thread_local_test_la_CPPFLAGS = $(AM_CPPFLAGS) thread_local_test_lib_la_CPPFLAGS = $(AM_CPPFLAGS)
lib_thread_local_test_la_SOURCES = ThreadLocalTestLib.cpp thread_local_test_lib_la_SOURCES = ThreadLocalTestLib.cpp
lib_thread_local_test_la_LDFLAGS = -rpath /force_shared thread_local_test_lib_la_LDFLAGS = -module -rpath /force_shared
lib_thread_local_test_la_LIBADD = $(top_builddir)/libfolly.la thread_local_test_lib_la_LIBADD = $(top_builddir)/libfolly.la
noinst_HEADERS = FBStringTestBenchmarks.cpp.h \ noinst_HEADERS = FBStringTestBenchmarks.cpp.h \
FBVectorTestBenchmarks.cpp.h FBVectorTestBenchmarks.cpp.h
......
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