diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-23 19:03:33 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-23 19:04:12 +0300 |
commit | 0fa4a7dcabc2bc30f758717bae310934184be4ec (patch) | |
tree | ed1ae6f0c005eed935c2494ff09893d89c9f0a2e /solenv/inc | |
parent | bump product version to 3.5.0-alpha0, release number to 0 (diff) | |
download | core-0fa4a7dcabc2bc30f758717bae310934184be4ec.tar.gz core-0fa4a7dcabc2bc30f758717bae310934184be4ec.zip |
Use correct CPPLCC when cross-compiling
Diffstat (limited to 'solenv/inc')
-rw-r--r-- | solenv/inc/settings.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 04c9feed94ca..61e7ba050173 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 |