# HG changeset patch
# User katleman
# Date 1348094753 25200
# Node ID 8ac23c0c609cd7d64bcb48214de9b14a66e8729a
# Parent  adea6fee501c21d5eadaca6b6d44a30b1c7b6c5a# Parent  c7aa4dc0d3fc66abbc1deda843eda75e201a34f4
Merge

diff -r c7aa4dc0d3fc -r 8ac23c0c609c jaxws/makefiles/Makefile
--- a/jaxws/makefiles/Makefile	Thu Sep 13 13:15:39 2012 -0700
+++ b/jaxws/makefiles/Makefile	Wed Sep 19 15:45:53 2012 -0700
@@ -40,12 +40,9 @@
 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
      JVM:=$(JAVA),\
      JAVAC:=$(JAVAC_JARS),\
-     FLAGS:=-Xprefer:source -XDignore.symbol.file=true -cp $(BOOT_JDK)/lib/tools.jar \
-		$(DISABLE_JAXWS_WARNINGS) -g,\
-     SERVER_DIR:=$(JAVAC_SERVERS),\
-     SERVER_JVM:=$(SERVER_JAVA),\
-     MODE:=$(JAVAC_USE_MODE),\
-     USE_DEPS:=$(JAVAC_USE_DEPS)))
+     FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
+     SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+     SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
 
 # Dummy here is needed to trigger copying of META-INF
 $(eval $(call SetupJavaCompilation,BUILD_JAF,\