Sun, 17 Jun 2012 21:37:21 -0700
Merge
1.1 --- a/.hgtags Mon Jun 11 15:33:28 2012 -0700 1.2 +++ b/.hgtags Sun Jun 17 21:37:21 2012 -0700 1.3 @@ -163,3 +163,5 @@ 1.4 a9f547c218d957306dfc0cdd710be041bb62a555 jdk8-b39 1.5 86e0dad6aadf626bf5755f503aee2d0da525d9d5 jdk8-b40 1.6 179fa85aeefab338cccf1cbe8b494c59bc5df122 jdk8-b41 1.7 +02c5a3575539e737a1855b31287654e843edd6da jdk8-b42 1.8 +f8c64d835b2806293b8e924b44f0e32b20657ed3 jdk8-b43
2.1 --- a/makefiles/Makefile Mon Jun 11 15:33:28 2012 -0700 2.2 +++ b/makefiles/Makefile Sun Jun 17 21:37:21 2012 -0700 2.3 @@ -23,12 +23,13 @@ 2.4 # questions. 2.5 # 2.6 2.7 +# This must be the first rule 2.8 +default: all 2.9 + 2.10 include $(SPEC) 2.11 include MakeBase.gmk 2.12 include JavaCompilation.gmk 2.13 2.14 -default: all 2.15 - 2.16 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools 2.17 # and the bootstrap javac, to be run by the bootdir jvm. 2.18 $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ 2.19 @@ -184,8 +185,7 @@ 2.20 SETUP:=GENERATE_NEWBYTECODE,\ 2.21 SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ 2.22 SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ 2.23 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar,\ 2.24 - HEADERS:=$(LANGTOOLS_OUTPUTDIR)/gensrc_headers)) 2.25 + JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) 2.26 2.27 $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ 2.28 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\