71 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
72 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
73
74 # The generate new bytecode javac setup uses the new compiler to compile for the
75 # new jdk. This new bytecode might only be possible to run using the new jvm.
76 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
77 JVM := $(JAVA_JAVAC), \
78 JAVAC := $(NEW_JAVAC), \
79 FLAGS := -source 9 -target 9 \
80 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
81 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
82 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
83
84 # After the jdk is built, we want to build demos using only the recently
85 # generated jdk classes and nothing else, no jdk source, etc etc.
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.
88 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
89 JVM := $(JAVA_SMALL), \
90 JAVAC := $(NEW_JAVAC), \
91 FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
92 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
93 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
94
95 endif # _SETUP_GMK
|
71 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
72 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
73
74 # The generate new bytecode javac setup uses the new compiler to compile for the
75 # new jdk. This new bytecode might only be possible to run using the new jvm.
76 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
77 JVM := $(JAVA_JAVAC), \
78 JAVAC := $(NEW_JAVAC), \
79 FLAGS := -source 9 -target 9 \
80 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
81 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
82 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
83
84 # After the jdk is built, we want to build demos using only the recently
85 # generated jdk classes and nothing else, no jdk source, etc etc.
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.
88 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
89 JVM := $(JAVA_SMALL), \
90 JAVAC := $(NEW_JAVAC), \
91 FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \
92 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
93 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
94
95 endif # _SETUP_GMK
|