hsqldb/makefile.mk | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 56dbf827aac92cbee5fa4e609c2a102faaac5860
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 9 15:36:51 2012 +0000
turns out that the java-is-gcj hack is a generic java 1.5 problem
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index 2e9fa8a..26c24a0 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -59,16 +59,19 @@ PATCH_FILES=patches$/i96823.patch \
patches$/i104901.patch \
patches$/jdbc-4.1.patch
-.IF "$(JAVACISGCJ)"=="yes"
+.IF "$(JAVACISGCJ)"=="yes" || "$(JAVA_SOURCE_VER)"=="1.5"
JAVA_HOME=
.EXPORT : JAVA_HOME
+.ENDIF
+
+.IF "$(JAVACISGCJ)"=="yes"
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
.ELSE
-.IF "$(debug)"!=""
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f
$(ANT_BUILDFILE) jar
-.ELSE
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
+
+.IF "$(debug)"!=""
+BUILD_ACTION+=-Dbuild.debug="on"
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
