254 HOTSPOT_DIST=@HOTSPOT_DIST@ |
254 HOTSPOT_DIST=@HOTSPOT_DIST@ |
255 NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist |
255 NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist |
256 |
256 |
257 BUILD_HOTSPOT=@BUILD_HOTSPOT@ |
257 BUILD_HOTSPOT=@BUILD_HOTSPOT@ |
258 |
258 |
259 # The boot jdk to use |
259 # The boot jdk to use. These are overridden in bootcycle-spec.gmk. Make sure to keep |
|
260 # them in sync. |
260 BOOT_JDK:=@BOOT_JDK@ |
261 BOOT_JDK:=@BOOT_JDK@ |
261 BOOT_RTJAR:=@BOOT_RTJAR@ |
262 BOOT_RTJAR:=@BOOT_RTJAR@ |
262 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar |
263 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar |
263 |
264 |
264 # When compiling Java source to be run by the boot jdk |
265 # When compiling Java source to be run by the boot jdk |
451 |
452 |
452 JAVA_FLAGS:=@JAVA_FLAGS@ |
453 JAVA_FLAGS:=@JAVA_FLAGS@ |
453 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ |
454 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ |
454 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@ |
455 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@ |
455 JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@ |
456 JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@ |
456 |
457 SJAVAC_SERVER_JAVA_FLAGS:=@SJAVAC_SERVER_JAVA_FLAGS@ |
457 JAVA=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_BIG) $(JAVA_FLAGS) |
458 |
458 JAVA_SMALL=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) |
459 # The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk |
459 |
460 # for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD |
460 JAVAC:=@FIXPATH@ @JAVAC@ |
461 # versions of the variables directly. |
|
462 JAVA_CMD:=@JAVA@ |
|
463 JAVAC_CMD:=@JAVAC@ |
|
464 JAVAH_CMD:=@JAVAH@ |
|
465 JAR_CMD:=@JAR@ |
|
466 NATIVE2ASCII_CMD:=@NATIVE2ASCII@ |
|
467 JARSIGNER_CMD:=@JARSIGNER@ |
|
468 SJAVAC_SERVER_JAVA_CMD:=@SJAVAC_SERVER_JAVA@ |
|
469 # These variables are meant to be used. They are defined with = instead of := to make |
|
470 # it possible to override only the *_CMD variables. |
|
471 JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS) |
|
472 JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) |
|
473 JAVAC=@FIXPATH@ $(JAVAC_CMD) |
|
474 JAVAH=@FIXPATH@ $(JAVAH_CMD) |
|
475 JAR=@FIXPATH@ $(JAR_CMD) |
|
476 NATIVE2ASCII=@FIXPATH@ $(NATIVE2ASCII_CMD) $(JAVA_TOOL_FLAGS_SMALL) |
|
477 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD) |
|
478 # A specific java binary with specific options can be used to run |
|
479 # the long running background sjavac servers and other long running tasks. |
|
480 SJAVAC_SERVER_JAVA=@FIXPATH@ $(SJAVAC_SERVER_JAVA_CMD) $(SJAVAC_SERVER_JAVA_FLAGS) |
|
481 |
461 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid |
482 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid |
462 # overriding that value by using ?=. |
483 # overriding that value by using ?=. |
463 JAVAC_FLAGS?=@JAVAC_FLAGS@ |
484 JAVAC_FLAGS?=@JAVAC_FLAGS@ |
464 |
|
465 JAVAH:=@FIXPATH@ @JAVAH@ |
|
466 |
|
467 JAR:=@FIXPATH@ @JAR@ |
|
468 |
|
469 NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(JAVA_TOOL_FLAGS_SMALL) |
|
470 |
|
471 JARSIGNER:=@FIXPATH@ @JARSIGNER@ |
|
472 |
485 |
473 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
486 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
474 INTERIM_LANGTOOLS_JAR := $(LANGTOOLS_OUTPUTDIR)/dist/interim_langtools.jar |
487 INTERIM_LANGTOOLS_JAR := $(LANGTOOLS_OUTPUTDIR)/dist/interim_langtools.jar |
475 INTERIM_LANGTOOLS_ARGS := "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR) |
488 INTERIM_LANGTOOLS_ARGS := "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR) |
476 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main |
489 NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main |