# HG changeset patch
# User simonis
# Date 1467122643 -7200
# Node ID cdb1013defd0042ff9bc2c40b002abd7f36fa0d1
# Parent  9decd6e374e2b85f945695958a5c717dc4ebd758
8160423: Serieal build is broken because of missing dependencies for jmod
Reviewed-by: erikj

diff -r 9decd6e374e2 -r cdb1013defd0 make/Main.gmk
--- a/make/Main.gmk	Tue Jun 28 14:20:17 2016 +0200
+++ b/make/Main.gmk	Tue Jun 28 16:04:03 2016 +0200
@@ -633,7 +633,9 @@
 
   # Jmods cannot be created until we have the jlink tool ready to run, which requires
   # all java modules to be compiled and jdk.jlink-launchers.
-  $(JMOD_TARGETS): java.base-libs jdk.jlink-launchers
+  # And we also need to copy jvm.cfg (done in java.base-copy) and tzdb.dat (done in
+  # java.base-gendata) to the appropriate location otherwise jimage, jlink and jmod won't start.
+  $(JMOD_TARGETS): java.base-libs java.base-copy java.base-gendata jdk.jlink-launchers
   # When creating a BUILDJDK, the java compilation has already been done by the
   # normal build and copied in.
   ifneq ($(CREATING_BUILDJDK), true)