# HG changeset patch
# User mchung
# Date 1459450162 25200
# Node ID 142c28f77753df874754ba348c65e27bf5e8bb71
# Parent  7df8bff6908967630a5d752002721c03c0a7c230
8153125: rmic from bootcycle build should launch with -m jdk.rmic/sun.rmi.rmic.Main
Reviewed-by: alanb, erikj

diff -r 7df8bff69089 -r 142c28f77753 jdk/make/rmic/RmicCommon.gmk
--- a/jdk/make/rmic/RmicCommon.gmk	Thu Mar 31 09:00:24 2016 -0700
+++ b/jdk/make/rmic/RmicCommon.gmk	Thu Mar 31 11:49:22 2016 -0700
@@ -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