568 # A specific java binary with specific options can be used to run
569 # the long running background sjavac servers and other long running tasks.
570 SJAVAC_SERVER_JAVA=@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \
571 $(SJAVAC_SERVER_JAVA_FLAGS)
572
573 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
574 # overriding that value by using ?=.
575 JAVAC_FLAGS?=@JAVAC_FLAGS@
576
577
578 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
579 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
580
581 # Use ?= as this can be overridden from bootcycle-spec.gmk
582 BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@
583
584 INTERIM_OVERRIDE_MODULES := java.compiler jdk.compiler \
585 jdk.jdeps jdk.javadoc jdk.rmic
586 ifeq ($(BOOT_JDK_MODULAR), true)
587 INTERIM_OVERRIDE_MODULES_ARGS = $(foreach m, $(INTERIM_OVERRIDE_MODULES), \
588 -Xpatch:$m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
589 INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS)
590 JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
591 JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main
592 else
593 INTERIM_OVERRIDE_MODULES_ARGS = \
594 -Xbootclasspath/p:$(call PathList, \
595 $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
596 $(INTERIM_OVERRIDE_MODULES)))
597 INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS) \
598 -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler
599 JAVAC_MAIN_CLASS = com.sun.tools.javac.Main
600 JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main
601 endif
602 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
603 # Use = assignment to be able to override in bootcycle-spec.gmk
604 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
605 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
606
607 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
608
|
568 # A specific java binary with specific options can be used to run
569 # the long running background sjavac servers and other long running tasks.
570 SJAVAC_SERVER_JAVA=@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \
571 $(SJAVAC_SERVER_JAVA_FLAGS)
572
573 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
574 # overriding that value by using ?=.
575 JAVAC_FLAGS?=@JAVAC_FLAGS@
576
577
578 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
579 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
580
581 # Use ?= as this can be overridden from bootcycle-spec.gmk
582 BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@
583
584 INTERIM_OVERRIDE_MODULES := java.compiler jdk.compiler \
585 jdk.jdeps jdk.javadoc jdk.rmic
586 ifeq ($(BOOT_JDK_MODULAR), true)
587 INTERIM_OVERRIDE_MODULES_ARGS = $(foreach m, $(INTERIM_OVERRIDE_MODULES), \
588 --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
589 INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS)
590 JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
591 JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main
592 else
593 INTERIM_OVERRIDE_MODULES_ARGS = \
594 -Xbootclasspath/p:$(call PathList, \
595 $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
596 $(INTERIM_OVERRIDE_MODULES)))
597 INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS) \
598 -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler
599 JAVAC_MAIN_CLASS = com.sun.tools.javac.Main
600 JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main
601 endif
602 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
603 # Use = assignment to be able to override in bootcycle-spec.gmk
604 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
605 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
606
607 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
608
|