summaryrefslogtreecommitdiff
path: root/testtools/Library_cppobj.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-14 15:52:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-14 15:52:04 +0200
commit16bbeb5713f4f9894e81ecf34a0e00f56a425f96 (patch)
tree4b200ccc2a5c47dcdfee73bdcb88b1d9f7eaf364 /testtools/Library_cppobj.mk
parent0f6cb25be8ef72ec1e3cadded38f0698edf08cb4 (diff)
Change the shared bridgetest code from static to dynamic library
...so ASan builds do not complain about ODR violations due to multiple instances of vtable for testtools::bridgetest::CurrentContextChecker after a53808c0ed577468393aced90963af6496706959 "loplugin:dllprivate" removed the SAL_DLLPRIVATE from class CurrentContextChecker (which apparently /did/ have an impact with -fvisibility-ms-compat, as used by Linux Clang ASan/UBSan builds). Change-Id: Ifb1ba1819f7ea989300f4696d44f9599a1436563
Diffstat (limited to 'testtools/Library_cppobj.mk')
-rw-r--r--testtools/Library_cppobj.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index f2d50d79b795..086b1fa0b6f5 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -26,14 +26,11 @@ $(eval $(call gb_Library_use_api,testtools_cppobj,\
$(eval $(call gb_Library_use_external,testtools_cppobj,boost_headers))
-$(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\
- testtools_bridgetest_s \
-))
-
$(eval $(call gb_Library_use_libraries,testtools_cppobj,\
cppu \
cppuhelper \
sal \
+ testtools_bridgetest-common \
))
$(eval $(call gb_Library_add_exception_objects,testtools_cppobj,\