diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -365,6 +365,7 @@ # TODO: This needs to be reenabled before integration into jdk9 #jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' -XDstringConcat=inline +jdk.compiler_ADD_JAVAC_FLAGS := -XDstringConcat=inline jdk.compiler_COPY := javax.tools.JavaCompilerTool jdk.compiler_CLEAN_FILES := $(wildcard \ $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ @@ -460,6 +461,13 @@ ################################################################################ +# Temporarily disable indy string concat disabled to get jake to build + +jdk.jmod_ADD_JAVAC_FLAGS := -XDstringConcat=inline +jdk.jlink_ADD_JAVAC_FLAGS := -XDstringConcat=inline + +################################################################################ + jdk.dev_CLEAN_FILES := $(wildcard \ $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \ com/sun/tools/script/shell))