Mercurial > hg > openjdk > jdk9
changeset 2262:7dcf453eacae jdk-9+139
8166965: Some small java build tools are still running with big JVM configuration
Reviewed-by: ihse
| author | erikj |
|---|---|
| date | Tue, 04 Oct 2016 13:41:51 +0200 |
| parents | 60addd60b367 |
| children | f73344fddabe 278f9a9e9329 |
| files | make/Javadoc.gmk make/MainSupport.gmk make/common/SetupJavaCompilers.gmk |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Javadoc.gmk Tue Oct 04 13:34:34 2016 +0200 +++ b/make/Javadoc.gmk Tue Oct 04 13:41:51 2016 +0200 @@ -1575,7 +1575,7 @@ $(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE) $(prep-javadoc) $(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE)) - $(JAVADOC_CMD) -d $(@D) \ + $(JAVADOC_CMD_SMALL) -d $(@D) \ @$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE) # Create file with javadoc options in it
--- a/make/MainSupport.gmk Tue Oct 04 13:34:34 2016 +0200 +++ b/make/MainSupport.gmk Tue Oct 04 13:41:51 2016 +0200 @@ -137,7 +137,6 @@ define DeclareRecipeForModuleMakefile ifeq ($$($1_MULTIPLE_MAKEFILES), true) $2-$$($1_TARGET_SUFFIX): $2-$$($1_TARGET_SUFFIX)-$$(notdir $3) - $1 += $2-$$($1_TARGET_SUFFIX)-$$(notdir $3) $2-$$($1_TARGET_SUFFIX)-$$(notdir $3): else @@ -173,6 +172,12 @@ # Only declare recipes if there are makefiles to call ifneq ($$($1_$2_TOPDIRS), ) + # Add the top dir specific target to target list regardless of if recipe + # generation is disabled. + ifeq ($$($1_MULTIPLE_MAKEFILES), true) + $$(foreach d, $$($1_$2_TOPDIRS), \ + $$(eval $1 += $2-$$($1_TARGET_SUFFIX)-$$(notdir $$d))) + endif ifeq ($(NO_RECIPES),) $$(foreach d, $$($1_$2_TOPDIRS), \ $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2,$$d)))
--- a/make/common/SetupJavaCompilers.gmk Tue Oct 04 13:34:34 2016 +0200 +++ b/make/common/SetupJavaCompilers.gmk Tue Oct 04 13:41:51 2016 +0200 @@ -38,7 +38,10 @@ # and the interim javac, to be run by the boot jdk. $(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ JAVAC := $(JAVAC), \ - FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -g \ + FLAGS := \ + $(JAVA_TOOL_FLAGS_SMALL) \ + $(BOOT_JDK_SOURCETARGET) \ + -XDignore.symbol.file=true -g \ -Xlint:all$(COMMA)-deprecation$(COMMA)-options -Werror, \ DISABLE_SJAVAC := true, \ ))