changeset 347:b128a49cc5bc

Merge
author alanb
date Wed, 11 Jul 2012 16:46:04 +0100
parents 319f81ca93f5 (current diff) ae368a83c240 (diff)
children 6cf57f65dbce
files .hgtags
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jun 09 13:39:10 2012 +0100
+++ b/.hgtags	Wed Jul 11 16:46:04 2012 +0100
@@ -170,3 +170,6 @@
 09a0ddda03cb36deb6ee9edf789da12aa4674c6b jdk8-b40
 f2072b164b0519227833a2994f78e3988ee67827 jdk8-b41
 1f20f37818a91b66eaeba268d0b785718598ee0e jdk8-b42
+f00c12994562c2f68d348a7c3e829374a89294e2 jdk8-b43
+f6a417540ef124c9b4123d07da5e26f2ab909949 jdk8-b44
+e80ac58b5ba904f24e125c742c30d0d740f05f86 jdk8-b45
--- a/makefiles/Makefile	Sat Jun 09 13:39:10 2012 +0100
+++ b/makefiles/Makefile	Wed Jul 11 16:46:04 2012 +0100
@@ -23,12 +23,13 @@
 # questions.
 #
 
+# This must be the first rule
+default: all
+
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
 
-default: all
-
 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