make/Main.gmk

*** 546,556 ****
    endif
  
    # The demos are currently linking to libjvm and libjava, just like all other
    # jdk libs, even though they don't need to. To avoid warnings, make sure they
    # aren't built until after libjava and libjvm are available to link to.
!   demos-jdk: $(JAVA_TARGETS)
  
    # Declare dependency from <module>-java to <module>-gensrc
    $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
  
    # Declare dependencies between java modules
--- 546,556 ----
    endif
  
    # The demos are currently linking to libjvm and libjava, just like all other
    # jdk libs, even though they don't need to. To avoid warnings, make sure they
    # aren't built until after libjava and libjvm are available to link to.
!   demos-jdk: java.base-libs exploded-image-optimize
  
    # Declare dependency from <module>-java to <module>-gensrc
    $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
  
    # Declare dependencies between java modules
*** 696,706 ****
  
    interim-image: $(addsuffix -jmod, $(INTERIM_IMAGE_MODULES))
  
    test-make: clean-test-make
  
!   build-test-lib: java
  
    build-test-failure-handler: interim-langtools
  
    test-failure-handler: build-test-failure-handler
  
--- 696,706 ----
  
    interim-image: $(addsuffix -jmod, $(INTERIM_IMAGE_MODULES))
  
    test-make: clean-test-make
  
!   build-test-lib: exploded-image-optimize
  
    build-test-failure-handler: interim-langtools
  
    test-failure-handler: build-test-failure-handler