equal
deleted
inserted
replaced
46 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build |
46 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build |
47 |
47 |
48 # Use a different Boot JDK |
48 # Use a different Boot JDK |
49 OLD_BOOT_JDK:=$(BOOT_JDK) |
49 OLD_BOOT_JDK:=$(BOOT_JDK) |
50 BOOT_JDK:=@BUILD_OUTPUT@/images/j2sdk-image |
50 BOOT_JDK:=@BUILD_OUTPUT@/images/j2sdk-image |
51 BOOT_RTJAR:=@BUILD_OUTPUT@/images/j2sdk-image/jre/lib/rt.jar |
51 BOOT_RTJAR:=$(BOOT_JDK)/jre/lib/rt.jar |
52 |
52 |
53 SJAVAC_SERVER_JAVA:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(SJAVAC_SERVER_JAVA)) |
53 JAVA_CMD:=$(BOOT_JDK)/bin/java |
|
54 JAVAC_CMD:=$(BOOT_JDK)/bin/javac |
|
55 JAVAH_CMD:=$(BOOT_JDK)/bin/javah |
|
56 JAR_CMD:=$(BOOT_JDK)/bin/jar |
|
57 NATIVE2ASCII_CMD:=$(BOOT_JDK)/bin/native2ascii |
|
58 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner |
|
59 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD) |
|
60 |