563 |
563 |
564 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ |
564 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ |
565 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) |
565 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) |
566 |
566 |
567 # Interim langtools and rmic modules and arguments |
567 # Interim langtools and rmic modules and arguments |
568 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.jdeps jdk.javadoc |
568 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc |
569 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES)) |
569 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES)) |
570 INTERIM_LANGTOOLS_ADD_EXPORTS := \ |
570 INTERIM_LANGTOOLS_ADD_EXPORTS := \ |
571 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \ |
571 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \ |
572 --add-exports java.base/jdk.internal.util.jar=jdk.jdeps.interim \ |
|
573 --add-exports java.base/jdk.internal.misc=jdk.jdeps.interim \ |
|
574 # |
572 # |
575 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \ |
573 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \ |
576 $(INTERIM_LANGTOOLS_MODULES)))) |
574 $(INTERIM_LANGTOOLS_MODULES)))) |
577 INTERIM_LANGTOOLS_ARGS := \ |
575 INTERIM_LANGTOOLS_ARGS := \ |
578 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \ |
576 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \ |