common/autoconf/spec.gmk.in

*** 572,595 ****
  BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
  
  # Use ?= as this can be overridden from bootcycle-spec.gmk
  BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@
  
! INTERIM_OVERRIDE_MODULES := java.compiler jdk.compiler \
!     jdk.jdeps jdk.javadoc jdk.rmic
  ifeq ($(BOOT_JDK_MODULAR), true)
!   INTERIM_OVERRIDE_MODULES_ARGS = $(foreach m, $(INTERIM_OVERRIDE_MODULES), \
        --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
!   INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS)
    JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
    JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main
  else
!   INTERIM_OVERRIDE_MODULES_ARGS = \
        -Xbootclasspath/p:$(call PathList, \
            $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
!               $(INTERIM_OVERRIDE_MODULES)))
!   INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS) \
        -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler
    JAVAC_MAIN_CLASS = com.sun.tools.javac.Main
    JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main
  endif
  # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
--- 572,606 ----
  BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
  
  # Use ?= as this can be overridden from bootcycle-spec.gmk
  BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@
  
! INTERIM_LANGTOOLS_OVERRIDE_MODULES := java.compiler jdk.compiler \
!     jdk.jdeps jdk.javadoc
! INTERIM_RMIC_OVERRIDE_MODULES := jdk.rmic
  ifeq ($(BOOT_JDK_MODULAR), true)
!   INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = $(foreach m, \
!       $(INTERIM_LANGTOOLS_OVERRIDE_MODULES), \
        --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
!   INTERIM_RMIC_OVERRIDE_MODULES_ARGS = $(foreach m, \
!       $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \
!       $(INTERIM_RMIC_OVERRIDE_MODULES), \
!       --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
!   INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS)
    JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
    JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main
  else
!   INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = \
!       -Xbootclasspath/p:$(call PathList, \
!           $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
!               $(INTERIM_LANGTOOLS_OVERRIDE_MODULES)))
!   INTERIM_RMIC_OVERRIDE_MODULES_ARGS = \
        -Xbootclasspath/p:$(call PathList, \
            $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
!               $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \
!               $(INTERIM_RMIC_OVERRIDE_MODULES)))
!   INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS) \
        -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler
    JAVAC_MAIN_CLASS = com.sun.tools.javac.Main
    JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main
  endif
  # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...