Merge jdk8-b43

Wed, 13 Jun 2012 16:58:00 -0700

author
katleman
date
Wed, 13 Jun 2012 16:58:00 -0700
changeset 1274
f8c64d835b28
parent 1272
e3d0a8fe4318
parent 1273
ac29cc95b5c5
child 1275
59cbead12ff4

Merge

     1.1 --- a/makefiles/Makefile	Fri Jun 08 12:45:43 2012 -0700
     1.2 +++ b/makefiles/Makefile	Wed Jun 13 16:58:00 2012 -0700
     1.3 @@ -23,12 +23,13 @@
     1.4  # questions.
     1.5  #
     1.6  
     1.7 +# This must be the first rule
     1.8 +default: all
     1.9 +
    1.10  include $(SPEC)
    1.11  include MakeBase.gmk
    1.12  include JavaCompilation.gmk
    1.13  
    1.14 -default: all
    1.15 -
    1.16  # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
    1.17  # and the bootstrap javac, to be run by the bootdir jvm.
    1.18  $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
    1.19 @@ -184,8 +185,7 @@
    1.20  			SETUP:=GENERATE_NEWBYTECODE,\
    1.21  			SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\
    1.22  			SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
    1.23 -			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar,\
    1.24 -			HEADERS:=$(LANGTOOLS_OUTPUTDIR)/gensrc_headers))
    1.25 +			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
    1.26  
    1.27                  $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\
    1.28  			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\

mercurial