Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8157506: Disable bootcycle build when cross compiling
authorerikj
Sat, 21 May 2016 18:23:28 +0200 (2016-05-21)
changeset 37980 b2d5f366a9ba
parent 37979 42ee4e537363
child 37981 e0375f6012c1
8157506: Disable bootcycle build when cross compiling Reviewed-by: alanb, tbell, mchung
make/Main.gmk file | annotate | diff | comparison | revisions 
--- a/make/Main.gmk	Sat May 21 18:21:53 2016 +0200
+++ b/make/Main.gmk	Sat May 21 18:23:28 2016 +0200
@@ -302,9 +302,13 @@
 
 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)
jdk-sandbox