# HG changeset patch
# User ohrstrom
# Date 1359637378 -3600
# Node ID 54beebb17494f4e945baac071b6f1dd1c28e0862
# Parent  966bf9f3c41a59ff5d86ff4275291c52f329f984
8006872: Stop creating four jars with identical content in the new build system.
Reviewed-by: erikj

diff -r 966bf9f3c41a -r 54beebb17494 makefiles/BuildJaxws.gmk
--- a/makefiles/BuildJaxws.gmk	Thu Jan 24 16:49:01 2013 -0800
+++ b/makefiles/BuildJaxws.gmk	Thu Jan 31 14:02:58 2013 +0100
@@ -30,8 +30,6 @@
 include MakeBase.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
 
 # The generate new bytecode uses the new compiler for to generate bytecode
@@ -39,7 +37,7 @@
 # cannot necessarily be run with the boot jdk.
 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
      JVM:=$(JAVA),\
-     JAVAC:=$(JAVAC_JARS),\
+     JAVAC:=$(NEW_JAVAC),\
      FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))