28 |
28 |
29 include $(SPEC) |
29 include $(SPEC) |
30 include MakeBase.gmk |
30 include MakeBase.gmk |
31 include JavaCompilation.gmk |
31 include JavaCompilation.gmk |
32 |
32 |
33 JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
|
34 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
|
35 DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static |
33 DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static |
36 |
34 |
37 # The generate new bytecode uses the new compiler for to generate bytecode |
35 # The generate new bytecode uses the new compiler for to generate bytecode |
38 # for the new jdk that is being built. The code compiled by this setup |
36 # for the new jdk that is being built. The code compiled by this setup |
39 # cannot necessarily be run with the boot jdk. |
37 # cannot necessarily be run with the boot jdk. |
40 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ |
38 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ |
41 JVM:=$(JAVA),\ |
39 JVM:=$(JAVA),\ |
42 JAVAC:=$(JAVAC_JARS),\ |
40 JAVAC:=$(NEW_JAVAC),\ |
43 FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ |
41 FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ |
44 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
42 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
45 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
43 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
46 |
44 |
47 # Dummy here is needed to trigger copying of META-INF |
45 # Dummy here is needed to trigger copying of META-INF |