# HG changeset patch # User mchung # Date 1408500473 25200 # Node ID 1aedb364117bc8fb5b9d9844d8dfcbb14837a78a # Parent bd4315f0084b861567ae86fe94e78152a8d72f95 8055497: [infra] build failure when building bootcycle image Reviewed-by: naoto diff -r bd4315f0084b -r 1aedb364117b make/Main.gmk --- a/make/Main.gmk Tue Aug 19 13:43:40 2014 +0200 +++ b/make/Main.gmk Tue Aug 19 19:07:53 2014 -0700 @@ -234,7 +234,8 @@ +($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk all) # Creates the jar files (rt.jar resources.jar etc) -main-jars: +# this depends on all modules built +main-jars: exploded-image +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk) # Creates the images (j2sdk-image j2re-image etc)