diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:08:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:08:29 +0000 |
| commit | 82a423595979385812c9e63ac2f00a828b9cd1c9 (patch) | |
| tree | 004387b1af2a7bb0ca73be722b4cb059e87f5aeb /hsqldb | |
| parent | 42b34df38dfc4028006dd2d480a96982fbc5b7b7 (diff) | |
INTEGRATION: CWS gcj3 (1.4.4); FILE MERGED
2005/03/07 15:20:33 cmc 1.4.4.1: #i44359# hsqldb can be built with gcj now
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index b1e3c4af22f6..febf08a0a425 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: vg $ $Date: 2005-02-16 16:02:01 $ +# last change: $Author: obo $ $Date: 2005-03-15 09:08:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,13 +68,7 @@ TARGET=so_hsqldb .INCLUDE : settings.mk .INCLUDE : version.mk -# --- Files -------------------------------------------------------- - .IF "$(SOLAR_JAVA)" != "" -.IF "$(JDK)" == "gcj" -all: - @echo This dir cannot be build with gcj because of sun.security.action.GetPropertyAction -.ELSE # --- Files -------------------------------------------------------- TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) @@ -96,9 +90,14 @@ ANT*:=$(ANT_HOME)$/bin$/ant ANT_BUILDFILE=build$/build.xml +.IF "$(JDK)"=="gcj" +JAVA_HOME= +.EXPORT : JAVA_HOME +BUILD_ACTION=$(ANT) -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +.ELSE BUILD_ACTION=$(ANT) -f $(ANT_BUILDFILE) jar - .ENDIF + .ENDIF # $(SOLAR_JAVA)!= "" # --- Targets ------------------------------------------------------ |