make/common/SetupJavaCompilers.gmk

*** 86,95 ****
  # I.e. the rt.jar, but since rt.jar has not yet been generated
  # (it will be in "make images") therefore we use classes instead.
  $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
      JVM := $(JAVA_SMALL), \
      JAVAC := $(NEW_JAVAC), \
!     FLAGS := -upgrademodulepath $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
      SERVER_DIR := $(SJAVAC_SERVER_DIR), \
      SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
  
  endif # _SETUP_GMK
--- 86,95 ----
  # I.e. the rt.jar, but since rt.jar has not yet been generated
  # (it will be in "make images") therefore we use classes instead.
  $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
      JVM := $(JAVA_SMALL), \
      JAVAC := $(NEW_JAVAC), \
!     FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
      SERVER_DIR := $(SJAVAC_SERVER_DIR), \
      SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
  
  endif # _SETUP_GMK