# HG changeset patch
# User katleman
# Date 1360119264 28800
# Node ID 0c08593944d0cd30645f6e1e4946c51ff2b10c8c
# Parent  8d65b381880bd58dbc12f3cda391034879165223# Parent  8f6ca8755f46eeab4c98eedcf6470056e7cffea6
Merge

diff -r 8d65b381880b -r 0c08593944d0 makefiles/BuildJaxp.gmk
--- a/makefiles/BuildJaxp.gmk	Thu Jan 31 17:04:37 2013 -0800
+++ b/makefiles/BuildJaxp.gmk	Tue Feb 05 18:54:24 2013 -0800
@@ -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_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
 
 # 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_JAXP_WARNINGS) -g,\
      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))