xmloff/Module_xmloff.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dfe08697b94e9b167a9bf66acf44ab5d6be562a
Author: Matúš Kukan <[email protected]>
Date:   Fri Jan 9 20:30:43 2015 +0100

    xmloff_uxmloff fails on Linux too, now -> disable it (mergelibs)
    
    Would be nicer to fix it though.
    
    Change-Id: Ia5f49a69374e9e79a9a16542bc44f279b9e5a6f7

diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index 93b9c9b..a3c5603 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,xmloff,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,xmloff,\
-       $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+       $(if $(MERGELIBS),, \
                CppunitTest_xmloff_uxmloff) \
 ))
 
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to