diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:15:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:15:03 +0000 |
| commit | cb6dbf4d8ef4b98f9576722047ed3be06571dfa7 (patch) | |
| tree | b005dd8039c5367c7c45b57d5fd2dfc51daef438 /solenv/inc/ant.mk | |
| parent | 6a9d288fe694bc889739e88ef9843faf84f02c53 (diff) | |
INTEGRATION: CWS gcj1 (1.25.84); FILE MERGED
2004/12/01 08:32:43 cmc 1.25.84.1: #i38188# add obscure command line arguments to get gcj/gij to play fair with the included premade jars
Diffstat (limited to 'solenv/inc/ant.mk')
| -rw-r--r-- | solenv/inc/ant.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index 78f635b5f73d..b50c1bd5c690 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -2,9 +2,9 @@ # # $RCSfile: ant.mk,v $ # -# $Revision: 1.25 $ +# $Revision: 1.26 $ # -# last change: $Author: rt $ $Date: 2004-09-08 14:52:00 $ +# last change: $Author: obo $ $Date: 2005-01-25 15:15:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -115,11 +115,19 @@ ANT_OPT=on .ENDIF .ENDIF +.IF "$(JDK)"=="gcj" +ANT_FLAGS!:=-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) -Dsolar.doc=$(SOLARDOCDIR) \ + -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \ + -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs -Dbuild.compiler=gcj +.ELSE ANT_FLAGS!:=-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) -Dsolar.doc=$(SOLARDOCDIR) \ -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \ -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs +.ENDIF .ELSE # No java ANT= ANT_FLAGS= |