On 31/03/2016 03:25, Mandy Chung wrote:
diff --git a/make/rmic/RmicCommon.gmk b/make/rmic/RmicCommon.gmk
--- a/make/rmic/RmicCommon.gmk
+++ b/make/rmic/RmicCommon.gmk
@@ -31,7 +31,13 @@
########################################################################################## -RMIC := $(JAVA) $(INTERIM_OVERRIDE_MODULES_ARGS) sun.rmi.rmic.Main
+ifeq ($(BOOT_JDK_MODULAR), true)
+  RMIC_MAIN_CLASS := -m jdk.rmic/sun.rmi.rmic.Main
+else
+  RMIC_MAIN_CLASS := sun.rmi.rmic.Main
+endif
+
+RMIC := $(JAVA) $(INTERIM_OVERRIDE_MODULES_ARGS) $(RMIC_MAIN_CLASS)
CLASSES_DIR := $(JDK_OUTPUTDIR)/modules
  # NOTE: If the smart javac dependency management is reintroduced, these 
classes risk

This looks okay to me.

-Alan

Reply via email to