[Libreoffice-commits] core.git: solenv/gbuild

[Rene Engelhard]

 solenv/gbuild/JavaClassSet.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 66b26b03cbfe9e72d64eef6875a6eec11bf13bf5
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 11 11:35:22 2017 +0100

    set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in JavaClassSet.mk
    
    .. to fix reportbuilder build with Java9.
    A direct -Dfile.encoding=UTF8 doesn't work...
    
    Change-Id: I231b2893df463d00eb514c0d50e02c8df41c5b20

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 58a16d95cf71..e7de44d6ccca 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -17,7 +17,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
+gb_JavaClassSet_JAVACCOMMAND := JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 \
+    $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
     -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) \
     $(if $(JAVA_CLASSPATH_NOT_SET),-Xlint:-options)
 gb_JavaClassSet_JAVACDEBUG :=