--- a/make/Images.gmk	Wed Oct 25 21:19:38 2017 -0700
+++ b/make/Images.gmk	Thu Oct 26 08:52:55 2017 +0200
@@ -432,8 +432,8 @@
 $(JRE_TARGETS): $(TOOL_JRE_TARGETS)
 $(JDK_TARGETS): $(TOOL_JDK_TARGETS)
 
-jdk: $(JDK_TARGETS)
-jre: $(JRE_TARGETS)
+jdk: $(TOOL_JDK_TARGETS) $(JDK_TARGETS)
+jre: $(TOOL_JRE_TARGETS) $(JRE_TARGETS)
 symbols: $(SYMBOLS_TARGETS)
 
 all: jdk jre symbols