Mercurial > hg > openjdk > lambda > jaxws

changeset 388:242e9b02a7b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author mduigou
date Wed, 20 Feb 2013 13:18:21 -0800
parents 4b5a0e75f534 (current diff) 391de4c992d1 (diff)
children a061a2962606
files .hgtags
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jan 29 10:20:52 2013 -0800
+++ b/.hgtags	Wed Feb 20 13:18:21 2013 -0800
@@ -200,3 +200,6 @@
 d9707230294d54e695e745a90de6112909100f12 jdk8-b72
 c606f644a5d9118c14b5822738bf23c300f14f24 jdk8-b73
 12db3c5a3393b03eeb09ff26f418c4420c21aaab jdk8-b74
+966bf9f3c41a59ff5d86ff4275291c52f329f984 jdk8-b75
+c4853f3f0e89ac60aa5b517f5f224f0f60e08577 jdk8-b76
+64dfba1bad16433f609f17a42c3c5990367c5c0b jdk8-b77
--- a/makefiles/BuildJaxws.gmk	Tue Jan 29 10:20:52 2013 -0800
+++ b/makefiles/BuildJaxws.gmk	Wed Feb 20 13:18:21 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_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)))