equal
deleted
inserted
replaced
29 include MakeBase.gmk |
29 include MakeBase.gmk |
30 include RMICompilation.gmk |
30 include RMICompilation.gmk |
31 |
31 |
32 ################################################################################ |
32 ################################################################################ |
33 |
33 |
34 ifeq ($(BOOT_JDK_MODULAR), true) |
34 RMIC_MAIN_CLASS := -m jdk.rmic.interim/sun.rmi.rmic.Main |
35 RMIC_MAIN_CLASS := -m jdk.rmic/sun.rmi.rmic.Main |
|
36 else |
|
37 RMIC_MAIN_CLASS := sun.rmi.rmic.Main |
|
38 endif |
|
39 |
35 |
40 RMIC := $(JAVA_SMALL) $(INTERIM_RMIC_OVERRIDE_MODULES_ARGS) $(RMIC_MAIN_CLASS) |
36 RMIC := $(JAVA_SMALL) $(INTERIM_RMIC_ARGS) $(RMIC_MAIN_CLASS) |
41 |
37 |
42 CLASSES_DIR := $(JDK_OUTPUTDIR)/modules |
38 CLASSES_DIR := $(JDK_OUTPUTDIR)/modules |
43 # NOTE: If the smart javac dependency management is reintroduced, these classes |
39 # NOTE: If the smart javac dependency management is reintroduced, these classes |
44 # risk interfering with the dependency checking. In that case they will need to |
40 # risk interfering with the dependency checking. In that case they will need to |
45 # be kept separate. |
41 # be kept separate. |