summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-12-17 18:11:18 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-12-17 18:12:07 -0600
commit8c0242d3a9689ff1c75693bd506b276f8fca75b3 (patch)
tree9866cc4082a421833709f4c6806b608f0ee96b9f /solenv
parent05e787fb5e32880ff51902137cfd8da9820cd870 (diff)
do not run cppunit on Mac when cross-compiling
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/macosx.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3c8329b7bdb1..f1187cc343ce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -339,7 +339,12 @@ endef
# CppunitTest class
+ifeq ($(CROSS_COMPILING),YES)
+gb_CppunitTest_CPPTESTPRECOMMAND := :
+else
gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+endif
+
gb_CppunitTest_SYSPRE := libtest_
gb_CppunitTest_EXT := .dylib
gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)