changeset 2151:20f1ee2fe834

8160423: Serieal build is broken because of missing dependencies for jmod Reviewed-by: erikj
author simonis
date Tue, 28 Jun 2016 16:04:03 +0200
parents 31261e7238af
children 7cd263acb48d
files make/Main.gmk
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)