247 |
247 |
248 BUILD_HOTSPOT=@BUILD_HOTSPOT@ |
248 BUILD_HOTSPOT=@BUILD_HOTSPOT@ |
249 |
249 |
250 # The boot jdk to use |
250 # The boot jdk to use |
251 BOOT_JDK:=@BOOT_JDK@ |
251 BOOT_JDK:=@BOOT_JDK@ |
252 BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@ |
|
253 BOOT_RTJAR:=@BOOT_RTJAR@ |
252 BOOT_RTJAR:=@BOOT_RTJAR@ |
254 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar |
253 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar |
255 |
254 |
256 # When compiling Java source to be run by the boot jdk |
255 # When compiling Java source to be run by the boot jdk |
257 # use these extra flags, eg -source 6 -target 6 |
256 # use these extra flags, eg -source 6 -target 6 |
434 OBJ_SUFFIX:=@OBJ_SUFFIX@ |
433 OBJ_SUFFIX:=@OBJ_SUFFIX@ |
435 |
434 |
436 POST_STRIP_CMD:=@POST_STRIP_CMD@ |
435 POST_STRIP_CMD:=@POST_STRIP_CMD@ |
437 POST_MCS_CMD:=@POST_MCS_CMD@ |
436 POST_MCS_CMD:=@POST_MCS_CMD@ |
438 |
437 |
439 JAVA_FLAGS:=@BOOT_JDK_JVMARGS@ |
438 JAVA_FLAGS:=@JAVA_FLAGS@ |
440 |
439 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ |
441 JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS) |
440 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@ |
|
441 |
|
442 JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS) |
|
443 JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) |
442 |
444 |
443 JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac |
445 JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac |
444 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid |
446 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid |
445 # overriding that value by using ?=. |
447 # overriding that value by using ?=. |
446 JAVAC_FLAGS?=@JAVAC_FLAGS@ |
448 JAVAC_FLAGS?=@JAVAC_FLAGS@ |
449 |
451 |
450 JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar |
452 JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar |
451 |
453 |
452 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic |
454 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic |
453 |
455 |
454 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii |
456 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii $(addprefix -J, $(JAVA_FLAGS_SMALL)) |
455 |
457 |
456 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner |
458 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner |
457 |
459 |
458 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
460 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
459 BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
461 BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |