[Libreoffice-commits] .: solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 16 17:26:40 PDT 2011
solenv/inc/settings.mk | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 25d2d649871e9895a79eca7c9e4e5609652259c5
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 17 03:14:32 2011 +0300
Don't run any cppunittester when cross-compiling
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index e44458f..5429a36 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1053,7 +1053,11 @@ CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
GDBCPPUNITTRACE=$(GDBTRACE)
.ENDIF
+.IF "$(CROSS_COMPILING)" == "YES"
+CPPUNITTESTER=\#
+.ELSE
CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunit/cppunittester
+.ENDIF
HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
More information about the Libreoffice-commits
mailing list