summaryrefslogtreecommitdiff
path: root/tomcat
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2010-09-16 18:33:30 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-09-16 18:33:30 +0200
commit0abe2eea123b69b8eefabb9da8a1695f0b75f248 (patch)
tree58cbf5aa2ab8dcd8055075f59fe8b42b04f90a21 /tomcat
parenta6b81f761f832977fbfbcecafb72f15cf8429366 (diff)
build-java-target-extensions.diff: Allow specifying java target version.
i#93115
Diffstat (limited to 'tomcat')
-rwxr-xr-xtomcat/makefile.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
index a4d8236b267f..b440e8465feb 100755
--- a/tomcat/makefile.mk
+++ b/tomcat/makefile.mk
@@ -49,7 +49,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/build.xml
PATCH_FILES=tomcat.patch
BUILD_DIR=jakarta-servletapi-5
+
+.IF "$(JAVACISGCJ)"=="yes"
BUILD_ACTION=$(ANT)
+.ELSE
+BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
+.ENDIF
# --- Targets ------------------------------------------------------