Merge
This commit is contained in:
commit
a0a52a2b85
@ -30,8 +30,6 @@ include $(SPEC)
|
|||||||
include MakeBase.gmk
|
include MakeBase.gmk
|
||||||
include JavaCompilation.gmk
|
include JavaCompilation.gmk
|
||||||
|
|
||||||
JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
|
|
||||||
-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
|
|
||||||
DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
|
DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
|
||||||
|
|
||||||
# The generate new bytecode uses the new compiler for to generate bytecode
|
# The generate new bytecode uses the new compiler for to generate bytecode
|
||||||
@ -39,7 +37,7 @@ DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-s
|
|||||||
# cannot necessarily be run with the boot jdk.
|
# cannot necessarily be run with the boot jdk.
|
||||||
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
|
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
|
||||||
JVM:=$(JAVA),\
|
JVM:=$(JAVA),\
|
||||||
JAVAC:=$(JAVAC_JARS),\
|
JAVAC:=$(NEW_JAVAC),\
|
||||||
FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
|
FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
|
||||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user