equal
deleted
inserted
replaced
40 endif |
40 endif |
41 |
41 |
42 |
42 |
43 # Override specific values to do a boot cycle build |
43 # Override specific values to do a boot cycle build |
44 |
44 |
|
45 # Use a different Boot JDK |
|
46 BOOT_JDK := $(JDK_IMAGE_DIR) |
|
47 |
45 # The bootcycle build has a different output directory |
48 # The bootcycle build has a different output directory |
46 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build |
49 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build |
47 |
50 SJAVAC_SERVER_DIR:=$(subst @BUILD_OUTPUT@,$(BUILD_OUTPUT),$(SJAVAC_SERVER_DIR)) |
48 # Use a different Boot JDK |
|
49 OLD_BOOT_JDK:=$(BOOT_JDK) |
|
50 BOOT_JDK:=@BUILD_OUTPUT@/images/j2sdk-image |
|
51 BOOT_RTJAR:=$(BOOT_JDK)/jre/lib/rt.jar |
|
52 |
51 |
53 JAVA_CMD:=$(BOOT_JDK)/bin/java |
52 JAVA_CMD:=$(BOOT_JDK)/bin/java |
54 JAVAC_CMD:=$(BOOT_JDK)/bin/javac |
53 JAVAC_CMD:=$(BOOT_JDK)/bin/javac |
55 JAVAH_CMD:=$(BOOT_JDK)/bin/javah |
54 JAVAH_CMD:=$(BOOT_JDK)/bin/javah |
56 JAR_CMD:=$(BOOT_JDK)/bin/jar |
55 JAR_CMD:=$(BOOT_JDK)/bin/jar |