changeset 2308:4f59b9e35f92

8167488: Race condition in build with new exploded-image-optimize target Reviewed-by: tbell, ihse
author erikj
date Wed, 12 Oct 2016 14:22:55 +0200
parents a00afe93860c
children a71d59e62c5b
files make/Main.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Tue Oct 11 11:28:19 2016 +0200
+++ b/make/Main.gmk	Wed Oct 12 14:22:55 2016 +0200
@@ -548,7 +548,7 @@
   # 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 @@
 
   test-make: clean-test-make
 
-  build-test-lib: java
+  build-test-lib: exploded-image-optimize
 
   build-test-failure-handler: interim-langtools