Tue, 05 Feb 2013 18:54:27 -0800
Merge
1.1 --- a/makefiles/BuildJaxws.gmk Thu Jan 31 17:04:40 2013 -0800 1.2 +++ b/makefiles/BuildJaxws.gmk Tue Feb 05 18:54:27 2013 -0800 1.3 @@ -30,8 +30,6 @@ 1.4 include MakeBase.gmk 1.5 include JavaCompilation.gmk 1.6 1.7 -JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.8 - -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 1.9 DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 1.10 1.11 # The generate new bytecode uses the new compiler for to generate bytecode 1.12 @@ -39,7 +37,7 @@ 1.13 # cannot necessarily be run with the boot jdk. 1.14 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ 1.15 JVM:=$(JAVA),\ 1.16 - JAVAC:=$(JAVAC_JARS),\ 1.17 + JAVAC:=$(NEW_JAVAC),\ 1.18 FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ 1.19 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 1.20 SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))