diff -r 918745561887 -r fd36993f7bf5 make/autoconf/spec.gmk.in
--- a/make/autoconf/spec.gmk.in	Tue Sep 12 19:03:59 2017 +0200
+++ b/make/autoconf/spec.gmk.in	Fri Sep 15 09:18:00 2017 -0700
@@ -133,13 +133,6 @@
 SRC_ROOT:=@TOPDIR@
 
 OUTPUT_ROOT:=@OUTPUT_ROOT@
-JDK_TOPDIR:=@JDK_TOPDIR@
-LANGTOOLS_TOPDIR:=@LANGTOOLS_TOPDIR@
-CORBA_TOPDIR:=@CORBA_TOPDIR@
-JAXP_TOPDIR:=@JAXP_TOPDIR@
-JAXWS_TOPDIR:=@JAXWS_TOPDIR@
-HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
-NASHORN_TOPDIR:=@NASHORN_TOPDIR@
 
 IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@
 IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@