basic/CppunitTest_basic_enable.mk | 2 --
basic/Module_basic.mk | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit e9bc6d789702f330a8a8d9eaa830a90d24d63a38
Author: Michael Stahl <mst...@redhat.com>
Date: Mon May 14 16:33:45 2012 +0200
Revert "attempt to disable multi-defined symbol on windows for basic test"
Let's hope this works now.
This reverts commit 6113b27ec15da2a3b140ae58676062d74c99b31e.
This reverts commit 4e90345a4dea1ddf0ddded4f1fcae1c87894e120.
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index e7091b6..fe430ff 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -36,8 +36,7 @@ $(eval $(call gb_Module_add_targets,basic,\
$(eval $(call gb_Module_add_check_targets,basic,\
CppunitTest_basic_scanner \
- $(if $(filter-out $(OS),WIN), \
- CppunitTest_basic_enable) \
+ CppunitTest_basic_enable \
))
endif
commit 4b88c6e705a432ca0350c20a3a4e5c7c74a3abdc
Author: Michael Stahl <mst...@redhat.com>
Date: Mon May 14 16:30:29 2012 +0200
CppunitTest_basic_enable does not seem to need library objects
and it apparently causes linking failures on Windows, so try without.
diff --git a/basic/CppunitTest_basic_enable.mk
b/basic/CppunitTest_basic_enable.mk
index 487cdd4..e6379c5 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -4,8 +4,6 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,basic_enable, \
basic/qa/cppunit/test_append \
))
-$(eval $(call gb_CppunitTest_use_library_objects,basic_enable,sb))
-
# add a list of all needed libraries here
$(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
comphelper \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
