equal
deleted
inserted
replaced
86 # I.e. the rt.jar, but since rt.jar has not yet been generated |
86 # I.e. the rt.jar, but since rt.jar has not yet been generated |
87 # (it will be in "make images") therefore we use classes instead. |
87 # (it will be in "make images") therefore we use classes instead. |
88 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \ |
88 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \ |
89 JVM := $(JAVA_SMALL), \ |
89 JVM := $(JAVA_SMALL), \ |
90 JAVAC := $(NEW_JAVAC), \ |
90 JAVAC := $(NEW_JAVAC), \ |
91 FLAGS := -upgrademodulepath $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \ |
91 FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \ |
92 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
92 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
93 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
93 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
94 |
94 |
95 endif # _SETUP_GMK |
95 endif # _SETUP_GMK |