From f33cf602b8a04cc33db0b13a904b2fc2fb1e02d0 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Sat, 21 May 2016 18:23:28 +0200
Subject: [PATCH] 8157506: Disable bootcycle build when cross compiling

Reviewed-by: alanb, tbell, mchung
---
 make/Main.gmk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index b0361fb83c3..cbde81f552c 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -302,9 +302,13 @@ $(SUPPORT_OUTPUTDIR)/source_tips: FRC
 
 BOOTCYCLE_TARGET := product-images
 bootcycle-images:
-	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	+$(MAKE) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
-	    JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
+        ifneq ($(COMPILE_TYPE), cross)
+	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
+	  +$(MAKE) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
+	      JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
+        else
+	  $(call LogWarn, Boot cycle build disabled when cross compiling)
+        endif
 
 zip-security:
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)