Merge
authorduke
Wed, 05 Jul 2017 18:22:45 +0200
changeset 13718 1541817da403
parent 13717 8ac23c0c609c (diff)
parent 13714 6a8ac3685211 (current diff)
child 13722 17faab0e7f7b
Merge
jdk/make/common/Defs-embedded.gmk
jdk/make/common/Release-embedded.gmk
--- a/jaxws/.hgtags	Wed Jul 05 18:22:41 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 18:22:45 2017 +0200
@@ -177,3 +177,4 @@
 8a35fd644d3c0b75813ff0236adef8a1c6f895c6 jdk8-b53
 91970935926a20f19a5cbbf20931745ac1975e91 jdk8-b54
 109c9e1f2d8546e9954e1b7be9a37a4396434544 jdk8-b55
+7813455ccdb08c3ee6051161176821325a5d44d7 jdk8-b56
--- a/jaxws/makefiles/Makefile	Wed Jul 05 18:22:41 2017 +0200
+++ b/jaxws/makefiles/Makefile	Wed Jul 05 18:22:45 2017 +0200
@@ -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,\