7170079: Adjustments to build-infra makefiles

Co-authored-by: Jonas Oreland <jonas.oreland@oracle.com>
Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
Co-authored-by: Torbjorn Granat <torbjorn.granat@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: ohair, ohrstrom, ihse, jonas
This commit is contained in:
Erik Joelsson 2012-06-07 20:30:57 -07:00
parent 6687eed677
commit 1ff2fcfeed

View File

@ -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 @@ ifeq ($(PROPS_ARE_CREATED),yes)
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,\