Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced
authorerikj
Tue, 21 Oct 2014 14:00:26 +0200
changeset 27135 cc1917dc458c
parent 27134 42fd290985fd
child 27136 ac3ebfa6b4ee
8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced Reviewed-by: tbell
make/CompileJavaModules.gmk file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox