544 JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS) 545 JAVAC=@FIXPATH@ $(JAVAC_CMD) 546 JAVAH=@FIXPATH@ $(JAVAH_CMD) 547 JAR=@FIXPATH@ $(JAR_CMD) 548 JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL) 549 JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL) 550 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD) 551 # A specific java binary with specific options can be used to run 552 # the long running background sjavac servers and other long running tasks. 553 SJAVAC_SERVER_JAVA=@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \ 554 $(SJAVAC_SERVER_JAVA_FLAGS) 555 556 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid 557 # overriding that value by using ?=. 558 JAVAC_FLAGS?=@JAVAC_FLAGS@ 559 560 561 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ 562 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) 563 564 # Use ?= as this can be overridden from bootcycle-spec.gmk 565 BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@ 566 567 INTERIM_LANGTOOLS_OVERRIDE_MODULES := java.compiler jdk.compiler \ 568 jdk.jdeps jdk.javadoc 569 INTERIM_RMIC_OVERRIDE_MODULES := jdk.rmic 570 ifeq ($(BOOT_JDK_MODULAR), true) 571 INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = $(foreach m, \ 572 $(INTERIM_LANGTOOLS_OVERRIDE_MODULES), \ 573 --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m) 574 INTERIM_RMIC_OVERRIDE_MODULES_ARGS = $(foreach m, \ 575 $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \ 576 $(INTERIM_RMIC_OVERRIDE_MODULES), \ 577 --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m) 578 INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS) 579 JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main 580 JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main 581 else 582 INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = \ 583 -Xbootclasspath/p:$(call PathList, \ 584 $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \ 585 $(INTERIM_LANGTOOLS_OVERRIDE_MODULES))) 586 INTERIM_RMIC_OVERRIDE_MODULES_ARGS = \ 587 -Xbootclasspath/p:$(call PathList, \ 588 $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \ 589 $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \ 590 $(INTERIM_RMIC_OVERRIDE_MODULES))) 591 INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS) \ 592 -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler 593 JAVAC_MAIN_CLASS = com.sun.tools.javac.Main 594 JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main 595 endif 596 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 597 # Use = assignment to be able to override in bootcycle-spec.gmk 598 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS) 599 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS) 600 601 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@ 602 603 # Base flags for RC 604 # Guarding this against resetting value. Legacy make files include spec multiple 605 # times. 606 ifndef RC_FLAGS 607 RC_FLAGS:=@RC_FLAGS@ 608 endif 609 610 # Tools adhering to a minimal and common standard of posix compliance. 611 AWK:=@AWK@ 612 BASENAME:=@BASENAME@ 613 CAT:=@CAT@ 614 CCACHE:=@CCACHE@ 615 # CD is going away, but remains to cater for legacy makefiles. | 544 JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS) 545 JAVAC=@FIXPATH@ $(JAVAC_CMD) 546 JAVAH=@FIXPATH@ $(JAVAH_CMD) 547 JAR=@FIXPATH@ $(JAR_CMD) 548 JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL) 549 JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL) 550 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD) 551 # A specific java binary with specific options can be used to run 552 # the long running background sjavac servers and other long running tasks. 553 SJAVAC_SERVER_JAVA=@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \ 554 $(SJAVAC_SERVER_JAVA_FLAGS) 555 556 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid 557 # overriding that value by using ?=. 558 JAVAC_FLAGS?=@JAVAC_FLAGS@ 559 560 561 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ 562 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) 563 564 INTERIM_LANGTOOLS_OVERRIDE_MODULES := java.compiler jdk.compiler \ 565 jdk.jdeps jdk.javadoc 566 INTERIM_RMIC_OVERRIDE_MODULES := jdk.rmic 567 INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = $(foreach m, \ 568 $(INTERIM_LANGTOOLS_OVERRIDE_MODULES), \ 569 --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m) 570 #INTERIM_RMIC_OVERRIDE_MODULES_ARGS = $(foreach m, \ 571 $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \ 572 $(INTERIM_RMIC_OVERRIDE_MODULES), \ 573 --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m) 574 INTERIM_RMIC_OVERRIDE_MODULES_ARGS = --upgrade-module-path $(BUILDTOOLS_OUTPUTDIR)/override_modules 575 INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS) 576 #INTERIM_LANGTOOLS_ARGS = --upgrade-module-path $(BUILDTOOLS_OUTPUTDIR)/override_modules 577 JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main 578 JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main 579 580 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 581 # Use = assignment to be able to override in bootcycle-spec.gmk 582 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS) 583 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS) 584 585 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@ 586 587 # Base flags for RC 588 # Guarding this against resetting value. Legacy make files include spec multiple 589 # times. 590 ifndef RC_FLAGS 591 RC_FLAGS:=@RC_FLAGS@ 592 endif 593 594 # Tools adhering to a minimal and common standard of posix compliance. 595 AWK:=@AWK@ 596 BASENAME:=@BASENAME@ 597 CAT:=@CAT@ 598 CCACHE:=@CCACHE@ 599 # CD is going away, but remains to cater for legacy makefiles. |