changeset 1221:7ff4bdb75613

Reenabled bootcycle-images
author erikj
date Thu, 02 Oct 2014 10:36:38 +0200
parents 075cb4fbcff1
children c9bbaf770ea6
files common/autoconf/bootcycle-spec.gmk.in make/Main.gmk
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/bootcycle-spec.gmk.in	Sat Sep 27 19:03:49 2014 +0100
+++ b/common/autoconf/bootcycle-spec.gmk.in	Thu Oct 02 10:36:38 2014 +0200
@@ -42,13 +42,13 @@
 
 # Override specific values to do a boot cycle build
 
+# Use a different Boot JDK
+OLD_BOOT_JDK := $(BOOT_JDK)
+BOOT_JDK := $(JDK_IMAGE_DIR)
+BOOT_RTJAR := $(JDK_IMAGE_DIR)/lib/modules/bootmodules.jimage
+BOOT_TOOLSJAR := $(JDK_IMAGE_DIR)/lib/modules/appmodules.jimage
+
 # The bootcycle build has a different output directory
-BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build
-
-# Use a different Boot JDK
-OLD_BOOT_JDK:=$(BOOT_JDK)
-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
+BUILD_OUTPUT := @BUILD_OUTPUT@/bootcycle-build
 
 SJAVAC_SERVER_JAVA:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(SJAVAC_SERVER_JAVA))
--- a/make/Main.gmk	Sat Sep 27 19:03:49 2014 +0100
+++ b/make/Main.gmk	Thu Oct 02 10:36:38 2014 +0200
@@ -432,7 +432,7 @@
 
   mac-bundles: jimages
 
-  bootcycle-images: legacy-images
+  bootcycle-images: jimages
 
   # Need to depend on jars as otherwise there will a race between all the
   # invocations of CreateJars.gmk.