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 RMIC := $(JAVA) $(INTERIM_OVERRIDE_MODULES_ARGS) sun.rmi.rmic.Main |
34 ifeq ($(BOOT_JDK_MODULAR), true) |
|
35 RMIC_MAIN_CLASS := -m jdk.rmic/sun.rmi.rmic.Main |
|
36 else |
|
37 RMIC_MAIN_CLASS := sun.rmi.rmic.Main |
|
38 endif |
|
39 |
|
40 RMIC := $(JAVA) $(INTERIM_OVERRIDE_MODULES_ARGS) $(RMIC_MAIN_CLASS) |
35 |
41 |
36 CLASSES_DIR := $(JDK_OUTPUTDIR)/modules |
42 CLASSES_DIR := $(JDK_OUTPUTDIR)/modules |
37 # NOTE: If the smart javac dependency management is reintroduced, these classes risk |
43 # NOTE: If the smart javac dependency management is reintroduced, these classes risk |
38 # interfering with the dependency checking. In that case they will need to be kept separate. |
44 # interfering with the dependency checking. In that case they will need to be kept separate. |
39 STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules |
45 STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules |