make/autoconf/spec.gmk.in

*** 574,596 ****
  INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
      $(INTERIM_LANGTOOLS_MODULES))))
  INTERIM_LANGTOOLS_ARGS := \
      --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
      --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
!     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \
      $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
      #
  JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
  JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
  
  INTERIM_RMIC_BASE_MODULES := jdk.rmic
  INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES))
  INTERIM_RMIC_ADD_EXPORTS := \
      --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \
      #
! INTERIM_RMIC_ARGS := --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \
!     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \
      $(INTERIM_RMIC_ADD_EXPORTS) \
      #
  
  # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
  # Use = assignment to be able to override in bootcycle-spec.gmk
--- 574,598 ----
  INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
      $(INTERIM_LANGTOOLS_MODULES))))
  INTERIM_LANGTOOLS_ARGS := \
      --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
      --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
!     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
      $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
      #
  JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
  JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
  
  INTERIM_RMIC_BASE_MODULES := jdk.rmic
  INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES))
  INTERIM_RMIC_ADD_EXPORTS := \
      --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \
      #
! # Use = to delay expansion of PathList since it's not available in this file.
! INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \
!     --module-path $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_modules \
!         $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules) \
      $(INTERIM_RMIC_ADD_EXPORTS) \
      #
  
  # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
  # Use = assignment to be able to override in bootcycle-spec.gmk