From 0b088d5ed8d45366395b677b7a8f36d4ab0bbaa8 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 4 Jan 2017 16:58:09 +0100
Subject: [PATCH] 8171929: "make docs" in clean forest is broken

Reviewed-by: mchung, tbell
---
 make/Main.gmk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index 6aa135b91a8..14add7f2046 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -630,13 +630,12 @@ else
   # in javadoc.
   java.desktop-gensrc-jdk: java.base-gensrc
 
-  # The annotation processing for jdk.vm.ci needs java.base classes from the
-  # current JDK.
-  jdk.vm.ci-gensrc-hotspot: java.base-java
-
-  # The annotation processing for jdk.vm.compiler needs classes from the current JDK.
-  jdk.vm.compiler-gensrc-hotspot: java.base-java java.management-java \
-      jdk.management-java jdk.vm.ci-java jdk.unsupported-java
+  # The annotation processing for jdk.vm.ci and jdk.vm.compiler needs classes
+  # from the current JDK.
+  jdk.vm.ci-gensrc-hotspot: $(addsuffix -java, \
+      $(call FindTransitiveDepsForModule, jdk.vm.ci))
+  jdk.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
+      $(call FindTransitiveDepsForModule, jdk.vm.compiler))
 
   # For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
   # file to be processed by the gensrc-moduleinfo target.