612 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
613 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
614 INTERIM_LANGTOOLS_ADD_EXPORTS := \
615 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
616 --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
617 --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
618 #
619 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
620 $(INTERIM_LANGTOOLS_MODULES))))
621 INTERIM_LANGTOOLS_ARGS := \
622 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
623 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
624 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
625 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
626 #
627 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
628 JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
629
630 INTERIM_RMIC_BASE_MODULES := jdk.rmic
631 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES))
632 INTERIM_RMIC_ADD_EXPORTS := \
633 --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \
634 #
635 # Use = to delay expansion of PathList since it's not available in this file.
636 INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \
637 --module-path $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_modules \
638 $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules) \
639 $(INTERIM_RMIC_ADD_EXPORTS) \
640 #
641
642 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
643 # Use = assignment to be able to override in bootcycle-spec.gmk
644 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
645 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
646
647 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
648
649 # Base flags for RC
650 # Guarding this against resetting value. Legacy make files include spec multiple
651 # times.
652 ifndef RC_FLAGS
653 RC_FLAGS:=@RC_FLAGS@
654 endif
655
656 # Tools adhering to a minimal and common standard of posix compliance.
657 AWK:=@AWK@
658 BASENAME:=@BASENAME@
659 CAT:=@CAT@
|
612 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
613 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
614 INTERIM_LANGTOOLS_ADD_EXPORTS := \
615 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
616 --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
617 --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
618 #
619 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
620 $(INTERIM_LANGTOOLS_MODULES))))
621 INTERIM_LANGTOOLS_ARGS := \
622 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
623 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
624 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
625 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
626 #
627 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
628 JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
629
630 INTERIM_RMIC_BASE_MODULES := jdk.rmic
631 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES))
632 #
633 # Use = to delay expansion of PathList since it's not available in this file.
634 INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc \
635 --module-path $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_modules \
636 $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules) \
637 #
638
639 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
640 # Use = assignment to be able to override in bootcycle-spec.gmk
641 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
642 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
643
644 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
645
646 # Base flags for RC
647 # Guarding this against resetting value. Legacy make files include spec multiple
648 # times.
649 ifndef RC_FLAGS
650 RC_FLAGS:=@RC_FLAGS@
651 endif
652
653 # Tools adhering to a minimal and common standard of posix compliance.
654 AWK:=@AWK@
655 BASENAME:=@BASENAME@
656 CAT:=@CAT@
|