559 560 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid 561 # overriding that value by using ?=. 562 JAVAC_FLAGS?=@JAVAC_FLAGS@ 563 564 565 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ 566 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) 567 568 # Interim langtools and rmic modules and arguments 569 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc 570 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES)) 571 INTERIM_LANGTOOLS_ADD_EXPORTS := \ 572 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \ 573 # 574 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \ 575 $(INTERIM_LANGTOOLS_MODULES)))) 576 INTERIM_LANGTOOLS_ARGS := \ 577 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \ 578 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \ 579 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \ 580 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \ 581 # 582 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main 583 JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main 584 585 INTERIM_RMIC_BASE_MODULES := jdk.rmic 586 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES)) 587 INTERIM_RMIC_ADD_EXPORTS := \ 588 --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \ 589 # 590 INTERIM_RMIC_ARGS := --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \ 591 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \ 592 $(INTERIM_RMIC_ADD_EXPORTS) \ 593 # 594 595 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 596 # Use = assignment to be able to override in bootcycle-spec.gmk 597 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS) 598 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS) 599 600 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@ 601 602 # Base flags for RC 603 # Guarding this against resetting value. Legacy make files include spec multiple 604 # times. 605 ifndef RC_FLAGS 606 RC_FLAGS:=@RC_FLAGS@ 607 endif 608 609 # Tools adhering to a minimal and common standard of posix compliance. 610 AWK:=@AWK@ 611 BASENAME:=@BASENAME@ | 559 560 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid 561 # overriding that value by using ?=. 562 JAVAC_FLAGS?=@JAVAC_FLAGS@ 563 564 565 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ 566 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) 567 568 # Interim langtools and rmic modules and arguments 569 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc 570 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES)) 571 INTERIM_LANGTOOLS_ADD_EXPORTS := \ 572 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \ 573 # 574 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \ 575 $(INTERIM_LANGTOOLS_MODULES)))) 576 INTERIM_LANGTOOLS_ARGS := \ 577 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \ 578 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \ 579 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \ 580 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \ 581 # 582 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main 583 JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main 584 585 INTERIM_RMIC_BASE_MODULES := jdk.rmic 586 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES)) 587 INTERIM_RMIC_ADD_EXPORTS := \ 588 --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \ 589 # 590 # Use = to delay expansion of PathList since it's not available in this file. 591 INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \ 592 --module-path $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_modules \ 593 $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules) \ 594 $(INTERIM_RMIC_ADD_EXPORTS) \ 595 # 596 597 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 598 # Use = assignment to be able to override in bootcycle-spec.gmk 599 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS) 600 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS) 601 602 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@ 603 604 # Base flags for RC 605 # Guarding this against resetting value. Legacy make files include spec multiple 606 # times. 607 ifndef RC_FLAGS 608 RC_FLAGS:=@RC_FLAGS@ 609 endif 610 611 # Tools adhering to a minimal and common standard of posix compliance. 612 AWK:=@AWK@ 613 BASENAME:=@BASENAME@ |