make/Main.gmk

*** 635,645 ****
    $(JAVA_TARGETS): interim-langtools
  
    # Declare dependencies between hotspot-<variant>* targets
    $(foreach v, $(JVM_VARIANTS), \
        $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
!       $(eval hotspot-$v-libs: hotspot-$v-gensrc) \
    )
  
    hotspot-ide-project: hotspot exploded-image
  
    generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
--- 635,645 ----
    $(JAVA_TARGETS): interim-langtools
  
    # Declare dependencies between hotspot-<variant>* targets
    $(foreach v, $(JVM_VARIANTS), \
        $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
!       $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
    )
  
    hotspot-ide-project: hotspot exploded-image
  
    generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
*** 689,700 ****
    # header file used by jdk.jdwp.agent-libs. The jdk.jdwp.agent-gensrc is a
    # virtual target.
    jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc
  
    # The swing beans need to have java base properly generated to avoid errors
!   # in javadoc.
!   java.desktop-gensrc-src: java.base-gensrc
  
    # The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
    # needs classes from the current JDK.
    jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
        $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
--- 689,701 ----
    # header file used by jdk.jdwp.agent-libs. The jdk.jdwp.agent-gensrc is a
    # virtual target.
    jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc
  
    # The swing beans need to have java base properly generated to avoid errors
!   # in javadoc. The X11 wrappers need the java.base include files to have been
!   # copied and processed.
!   java.desktop-gensrc-src: java.base-gensrc java.base-copy
  
    # The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
    # needs classes from the current JDK.
    jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
        $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))