diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk index a5c983be0b8c..ad2f9cb60a60 100644 --- a/saxon/ExternalProject_saxon.mk +++ b/saxon/ExternalProject_saxon.mk @@ -28,9 +28,8 @@ $(call gb_ExternalProject_get_state_target,saxon,build) : )\ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ $(if $(debug),-Dbuild.debug="on") \ -Dsolarbindir=$(OUTDIR)/bin jar-bj && \ touch $@ diff --git a/saxon/build.xml b/saxon/build.xml index c9026f7778ea..a6e77140e84d 100644 --- a/saxon/build.xml +++ b/saxon/build.xml @@ -139,10 +139,7 @@ - - - - + - + optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}"> @@ -441,8 +433,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"> @@ -456,8 +447,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"> @@ -789,8 +779,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + source="${build.compiler.source}">