makefiles/Setup.gmk

*** 38,48 ****
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
       JVM:=$(JAVA),\
       JAVAC:=$(NEW_JAVAC),\
!      FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
  # After the jdk is built, we want to build demos using only the recently
  # generated jdk classes and nothing else, no jdk source, etc etc.
--- 38,50 ----
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
       JVM:=$(JAVA),\
       JAVAC:=$(NEW_JAVAC),\
!      FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
!             -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS) \
!             $(GENERATE_JDKBYTECODE_EXTRA_FLAGS),\
       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
  # After the jdk is built, we want to build demos using only the recently
  # generated jdk classes and nothing else, no jdk source, etc etc.