make/CompileInterimLangtools.gmk

@@ -43,20 +43,20 @@
   $$(eval $$(call SetupJavaCompilation,BUILD_INTERIM_$(strip $1), \
       SETUP := BOOT_JAVAC, \
       DISABLE_SJAVAC := true, \
       SRC := $(TOPDIR)/src/$(strip $1)/share/classes \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
-      EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap \
-          com/sun/tools/jdeprscan, \
-      EXCLUDE_FILES := module-info.java JavacToolProvider.java \
-          JavadocToolProvider.java Standard.java, \
+      EXCLUDES := com/sun/tools/jdeprscan, \
+      EXCLUDE_FILES := Standard.java, \
       COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/$(strip $1), \
-      ADD_JAVAC_FLAGS := -Xbootclasspath/p:$$(call PathList, \
-          $$(foreach m, $2, $(BUILDTOOLS_OUTPUTDIR)/override_modules/$$m)), \
+      ADD_JAVAC_FLAGS := --upgrade-module-path $(BUILDTOOLS_OUTPUTDIR)/override_modules, \
   ))
 
+#$$(foreach m, $$2, \
+          --patch-module $$m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$$m), \
+
   $$(BUILD_INTERIM_$(strip $1)): $$(foreach m, $2, $$(BUILD_INTERIM_$(strip $$m)))
 
   TARGETS += $$(BUILD_INTERIM_$(strip $1))
 endef