diff options
| -rw-r--r-- | connectivity/CppunitTest_connectivity_commontools.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index e1c899ee1780..e9d6e9859840 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -35,6 +35,16 @@ $(eval $(call gb_CppunitTest_add_defs,connectivity_commontools,\ )) endif +# In mergedlibs mode we have multiply-defined symbols, which Visual Studio +# does not like. There is no good solution, so just force it. +ifeq ($(COM),MSC) +ifeq ($(MERGELIBS),CORE) +$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ + /FORCE:MULTIPLE \ +)) +endif +endif + $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \ connectivity/qa/connectivity/commontools/FValue_test \ )) |