--- a/langtools/make/CompileInterim.gmk	Tue Nov 18 15:25:18 2014 -0800
+++ b/langtools/make/CompileInterim.gmk	Wed Dec 03 14:25:46 2014 +0000
@@ -29,9 +29,9 @@
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
+include SetupJavaCompilers.gmk
 
-include CommonLangtools.gmk
-
+################################################################################
 # Setup the rules to build the interim langtools jar, which is compiled by
 # the boot javac and can be run on the boot jdk. This will be used to compile
 # the rest of the product. Include the Genstubs build tool in this compilation
@@ -44,12 +44,12 @@
       $(LANGTOOLS_TOPDIR)/src/jdk.dev/share/classes \
       $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes \
       $(LANGTOOLS_TOPDIR)/src/java.base/share/classes \
-      $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler \
-      $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.dev \
-      $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.javadoc, \
-    EXCLUDES := com/sun/tools/javac/nio compileproperties anttasks crules, \
-    COPY := $(RESOURCE_SUFFIXES) jdeps.properties jdkinternals.properties version.properties, \
-    BIN := $(LANGTOOLS_OUTPUTDIR)/interim_classes, \
+      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.compiler \
+      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.dev \
+      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.javadoc, \
+    EXCLUDES := sun jdk, \
+    COPY := .gif .xml .css .js javax.tools.JavaCompilerTool, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_interim_classes, \
     JAR := $(INTERIM_LANGTOOLS_JAR)))
 
 all: $(BUILD_INTERIM_LANGTOOLS)