From a467175dda93b8fb78efdae0dff9295eac46fec2 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 12 Oct 2016 14:22:55 +0200
Subject: [PATCH] 8167488: Race condition in build with new
 exploded-image-optimize target

Reviewed-by: tbell, ihse
---
 make/Main.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index 44c8c192172..cad7b5b19f5 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -548,7 +548,7 @@ else
   # The demos are currently linking to libjvm and libjava, just like all other
   # jdk libs, even though they don't need to. To avoid warnings, make sure they
   # aren't built until after libjava and libjvm are available to link to.
-  demos-jdk: $(JAVA_TARGETS)
+  demos-jdk: java.base-libs exploded-image-optimize
 
   # Declare dependency from <module>-java to <module>-gensrc
   $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
@@ -698,7 +698,7 @@ else
 
   test-make: clean-test-make
 
-  build-test-lib: java
+  build-test-lib: exploded-image-optimize
 
   build-test-failure-handler: interim-langtools