diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:13:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:13:42 +0000 |
| commit | 8a2cee8b79f2fbfbace912f49cb50979d3d2d486 (patch) | |
| tree | 834321f4e472314fe27d512a74c1c3f20e4443d9 /hsqldb | |
| parent | 54b738dd77867466afade83a95c6e1e5d4b4c539 (diff) | |
INTEGRATION: CWS targetedaot (1.11.14); FILE MERGED
2006/07/03 08:32:52 cmc 1.11.14.1: #i66685# use new test for compiler is gcj, not old test for JDK is gcj
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 0b374ddc27b1..bf8db0d6bc47 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: kz $ $Date: 2006-01-31 18:42:02 $ +# last change: $Author: kz $ $Date: 2006-07-05 21:13:42 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ PATCH_FILE_NAME=hsqldb_1_8_0 # override buildfile ANT_BUILDFILE=build$/build.xml -.IF "$(JDK)"=="gcj" +.IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar |