summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-10 12:39:25 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-10 12:39:25 +0300
commitec098ad49f7a4945817c5310f2d250ab13fc85ca (patch)
tree4285d7ff5f1ae4d3826dc7ed6a79d789ec9a5d14
parente2562f348601c51a0e387686365af632229351d4 (diff)
Don't run cppunittester automatically when cross-compiling
-rw-r--r--sal/qa/cppunit_local.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk
index 4b452b73c..eaa662877 100644
--- a/sal/qa/cppunit_local.mk
+++ b/sal/qa/cppunit_local.mk
@@ -25,6 +25,10 @@
# cppunittester is built in this module; cannot use delivered version
# this should be kept in sync with the definition in solenv/inc/settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+CPPUNITTESTER=\#
+.ELSE
CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester
+.ENDIF
.INCLUDE : _cppunit.mk