summaryrefslogtreecommitdiff
path: root/solenv/gbuild/platform/winmingw.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-20 19:06:43 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-20 19:12:53 +0300
commit944949d956e0fbfbec511c3f118f435911fb6d38 (patch)
treeafd1144d5eb11be7e9daeb5d29a7ec6fdb62d02f /solenv/gbuild/platform/winmingw.mk
parent4d07e370c72e2007b97cf44b673339bb605df19a (diff)
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?
Diffstat (limited to 'solenv/gbuild/platform/winmingw.mk')
-rw-r--r--solenv/gbuild/platform/winmingw.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 8626d4b37880..dd93e79c9545 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)