# HG changeset patch
# User erikj
# Date 1448638162 -3600
# Node ID ce71d2b2f34bb2981e3ce84421476059d15270f8
# Parent  8f2e018462893ad771ddf28a3b8051a2a06c9d95
8144172: Problem with bootcycle-images and sjavac
Reviewed-by: ihse

diff -r 8f2e01846289 -r ce71d2b2f34b common/autoconf/bootcycle-spec.gmk.in
--- a/common/autoconf/bootcycle-spec.gmk.in	Wed Nov 25 15:56:29 2015 +0100
+++ b/common/autoconf/bootcycle-spec.gmk.in	Fri Nov 27 16:29:22 2015 +0100
@@ -59,3 +59,8 @@
 JAR_CMD:=$(BOOT_JDK)/bin/jar
 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
+# When building a 32bit target, make sure the sjavac server flags are compatible
+# with a 32bit JVM.
+ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+  SJAVAC_SERVER_JAVA_FLAGS:= -Xms256M -Xmx1500M
+endif
diff -r 8f2e01846289 -r ce71d2b2f34b make/Main.gmk
--- a/make/Main.gmk	Wed Nov 25 15:56:29 2015 +0100
+++ b/make/Main.gmk	Fri Nov 27 16:29:22 2015 +0100
@@ -226,8 +226,8 @@
 BOOTCYCLE_TARGET := product-images
 bootcycle-images:
 	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Main.gmk \
-	    SPEC=$(dir $(SPEC))bootcycle-spec.gmk $(BOOTCYCLE_TARGET)
+	+$(MAKE) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
+	    JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
 
 zip-security:
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)