[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/settings.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit f5a6fde9ef08624beddd5d3db2ea97d66fb4ca76
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 23 19:03:33 2011 +0300

    Use correct CPPLCC when cross-compiling

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 04c9fee..61e7ba0 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1092,7 +1092,14 @@ JAVA*:=$(JAVAINTERPRETER)
 SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
 SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
 LZIP*=lzip
+
+# Note that $(CPPLCC) is oddly enough only used when $(OS)==WNT, see pstrules.mk.
+# For the BUILD platform when cross-compiling (always Unix), it is called cpp.lcc
+.IF "$(CROSS_COMPILING)" == "YES"
+CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc
+.ELSE
 CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
+.ENDIF
 
 .IF "$(DISABLE_ENHANCED_COMID)"==""
 .INCLUDE : tg_compv.mk