diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 19:59:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 19:59:17 +0000 |
| commit | 9583f91561fa6f38b3fbfb6d52b2431512299628 (patch) | |
| tree | 16d85d5b9f6a41d92d842f2a4419110a198338b3 /solenv/inc/antsettings.mk | |
| parent | f552a645555605922c2ff2c20ab9aa9e279f6994 (diff) | |
INTEGRATION: CWS targetedaot (1.2.92); FILE MERGED
2006/04/25 16:23:43 cmc 1.2.92.1: #i54692# separate gcj AOT support from bytecode creation
Diffstat (limited to 'solenv/inc/antsettings.mk')
| -rw-r--r-- | solenv/inc/antsettings.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index 532fef478a8d..fec66726ceca 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -4,9 +4,9 @@ # # $RCSfile: antsettings.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: kz $ $Date: 2006-01-31 18:48:27 $ +# last change: $Author: kz $ $Date: 2006-07-05 20:59:17 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -72,6 +72,9 @@ ANT_OPT=on .IF "$(JDK)"=="gcj" JAVA_HOME= .EXPORT : JAVA_HOME +.ENDIF + +.IF "$(JAVACISGCJ)" == "yes" ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \ -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \ -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \ |