Mercurial > hg > icedtea9-forest > langtools
changeset 1311:e534aa747b22
Merge
author | lana |
---|---|
date | Sun, 17 Jun 2012 21:37:21 -0700 |
parents | 9cafabb5e576 (current diff) 59cbead12ff4 (diff) |
children | 34e254ffd0e7 |
files | |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 11 15:33:28 2012 -0700 +++ b/.hgtags Sun Jun 17 21:37:21 2012 -0700 @@ -163,3 +163,5 @@ a9f547c218d957306dfc0cdd710be041bb62a555 jdk8-b39 86e0dad6aadf626bf5755f503aee2d0da525d9d5 jdk8-b40 179fa85aeefab338cccf1cbe8b494c59bc5df122 jdk8-b41 +02c5a3575539e737a1855b31287654e843edd6da jdk8-b42 +f8c64d835b2806293b8e924b44f0e32b20657ed3 jdk8-b43
--- a/makefiles/Makefile Mon Jun 11 15:33:28 2012 -0700 +++ b/makefiles/Makefile Sun Jun 17 21:37:21 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 - # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools # and the bootstrap javac, to be run by the bootdir jvm. $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ @@ -184,8 +185,7 @@ SETUP:=GENERATE_NEWBYTECODE,\ SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar,\ - HEADERS:=$(LANGTOOLS_OUTPUTDIR)/gensrc_headers)) + JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\