changeset 1263:cf519260c755

8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced Reviewed-by: tbell
author erikj
date Tue, 21 Oct 2014 14:00:26 +0200
parents 0127a0de9a8f
children 51ae5ede31b1
files make/CompileJavaModules.gmk
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Mon Oct 20 21:12:34 2014 +0000
+++ b/make/CompileJavaModules.gmk	Tue Oct 21 14:00:26 2014 +0200
@@ -479,6 +479,11 @@
   $1_DEPS := $$(call FindDepsForModule, $1)
 
   $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
+  # When crypto classes are prebuilt, need to look for classes already in 
+  # output dir.
+  ifneq ($(BUILD_CRYPTO), true)
+    $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
+  endif
   ifeq ($1, jdk.hotspot.agent)
     ## The source of this module is compiled elsewhere, hotspot, and imported.
     ## Service types are required in the classpath when compiing module-info