diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-09 15:36:51 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-18 16:37:49 +0200 |
| commit | e797c1f808b826aa79ce0227d56c25d626de3bb2 (patch) | |
| tree | d73de8e861efecab2ee5eb7e02463e3c72abf553 /hsqldb | |
| parent | 379b2f8b28075e04f26cb96436dcbb73fecae779 (diff) | |
turns out that the java-is-gcj hack is a generic java 1.5 problem
(cherry picked from commit 56dbf827aac92cbee5fa4e609c2a102faaac5860)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 2e9fa8a21af8..26c24a08dcf8 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)!= "" |