--- a/make/common/SetupJavaCompilers.gmk Thu Jan 28 07:59:44 2016 +0100
+++ b/make/common/SetupJavaCompilers.gmk Thu Jan 28 19:42:10 2016 +0300
@@ -55,7 +55,7 @@
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
JVM := $(JAVA_SMALL), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true \
+ FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \
$(DISABLE_WARNINGS) -Xlint:-options, \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))