# HG changeset patch
# User ohair
# Date 1347992984 25200
# Node ID bbcbebb9bc745abdfb9977cd36e11ef1f3df7435
# Parent  7813455ccdb08c3ee6051161176821325a5d44d7
7197849: Update new build-infra makefiles
Reviewed-by: ihse, erikj, ohrstrom, tbell

diff -r 7813455ccdb0 -r bbcbebb9bc74 makefiles/Makefile
--- a/makefiles/Makefile	Thu Sep 06 17:27:48 2012 -0700
+++ b/makefiles/Makefile	Tue Sep 18 11:29:44 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,\