changeset 352:a079926a6d81

Merge
author lana
date Sun, 17 Jun 2012 21:29:12 -0700
parents 0c7f86d9ff8b (current diff) 0b3f3a4ce139 (diff)
children 54a86b897fe8 7920ead2cc75
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 12 10:23:49 2012 -0700
+++ b/.hgtags	Sun Jun 17 21:29:12 2012 -0700
@@ -163,3 +163,5 @@
 f95fdbe525c88ef0d57dc1390be6582a8af5e07c jdk8-b39
 9ecfdbd6aed4702674eaede2023b4a19513d6b36 jdk8-b40
 6f5c0e17415de7a9c74900ef4ba12f47accdf88b jdk8-b41
+39ee03c1602155ff02e5feb6cd44869452f24cf7 jdk8-b42
+eff4ece9c8bc43b3ce2b3758574c4c20147f0689 jdk8-b43
--- a/makefiles/Makefile	Tue Jun 12 10:23:49 2012 -0700
+++ b/makefiles/Makefile	Sun Jun 17 21:29:12 2012 -0700
@@ -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_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough