Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8153125: rmic from bootcycle build should launch with -m jdk.rmic/sun.rmi.rmic.Main
authormchung
Thu, 31 Mar 2016 11:49:22 -0700
changeset 36749 142c28f77753
parent 36748 7df8bff69089
child 36750 cb05d63f5bb2
8153125: rmic from bootcycle build should launch with -m jdk.rmic/sun.rmi.rmic.Main Reviewed-by: alanb, erikj
jdk/make/rmic/RmicCommon.gmk file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox