[Libreoffice-commits] .: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/winmingw.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 4fda3d9fc4027e0b1d8c7f75cee750563ad8907c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jul 20 19:06:43 2011 +0300

    Don't run cppunittester when cross-compiling to Windows
    
    Maybe we should just bypass it in general for all platforms when
    cross-compiling in CppunitTest.mk, instead of separately for each
    platform that is a potential cros--compilation target?
    
    On the other hand, we might want to in some cases run unit tests using
    some emulator like wine or QEMU, using some remote execution
    mechanism, or whatever?

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 8626d4b..dd93e79 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -629,7 +629,11 @@ gb_Executable_Executable_platform =
 
 # CppunitTest class
 
+ifeq ($(CROSS_COMPILING),YES)
+gb_CppunitTest_CPPTESTPRECOMMAND := :
+else
 gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+endif
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)