changeset 1184:f811c6354ec2

Switching bootcycle-images to use jimage (not working yet)
author erikj
date Fri, 19 Sep 2014 12:33:09 +0200
parents 5e390420e4b7
children 545d0f49a0d3
files common/autoconf/bootcycle-spec.gmk.in
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/bootcycle-spec.gmk.in	Fri Sep 19 12:19:46 2014 +0200
+++ b/common/autoconf/bootcycle-spec.gmk.in	Fri Sep 19 12:33:09 2014 +0200
@@ -47,7 +47,8 @@
 
 # Use a different Boot JDK
 OLD_BOOT_JDK:=$(BOOT_JDK)
-BOOT_JDK:=@BUILD_OUTPUT@/dist/j2sdk-image
-BOOT_RTJAR:=@BUILD_OUTPUT@/dist/j2sdk-image/jre/lib/rt.jar
+BOOT_JDK:=@BUILD_OUTPUT@/dist/jdk-jimage
+BOOT_RTJAR:=@BUILD_OUTPUT@/dist/jdk-jimage/lib/modules/bootmodules.jimage
+BOOT_TOOLSJAR:=@BUILD_OUTPUT@/dist/jdk-jimage/lib/modules/appmodules.jimage
 
 SJAVAC_SERVER_JAVA:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(SJAVAC_SERVER_JAVA))