stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8166965: Some small java build tools are still running with big JVM configuration

Browse Source 
Reviewed-by: ihse
This commit is contained in:
Erik Joelsson 2016-10-04 13:41:51 +02:00
parent 5735e2f331
commit 4b223f6329
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/Javadoc.gmk
View File

@ -1575,7 +1575,7 @@ $(JACCESSAPI_INDEX_HTML): GET2DOCSDIR=$(JACCESSAPI2COREAPI)/..
$(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE) $(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE)) $(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD_SMALL) -d $(@D) \
@$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE) @$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE)
# Create file with javadoc options in it # Create file with javadoc options in it

7
make/MainSupport.gmk
View File

@ -137,7 +137,6 @@ MAKE_MAKEDIR_LIST := make
define DeclareRecipeForModuleMakefile define DeclareRecipeForModuleMakefile
ifeq ($$($1_MULTIPLE_MAKEFILES), true) ifeq ($$($1_MULTIPLE_MAKEFILES), true)
$2-$$($1_TARGET_SUFFIX): $2-$$($1_TARGET_SUFFIX)-$$(notdir $3) $2-$$($1_TARGET_SUFFIX): $2-$$($1_TARGET_SUFFIX)-$$(notdir $3)
$1 += $2-$$($1_TARGET_SUFFIX)-$$(notdir $3)
$2-$$($1_TARGET_SUFFIX)-$$(notdir $3): $2-$$($1_TARGET_SUFFIX)-$$(notdir $3):
else else
@ -173,6 +172,12 @@ define DeclareRecipesForPhaseAndModule
# Only declare recipes if there are makefiles to call # Only declare recipes if there are makefiles to call
ifneq ($$($1_$2_TOPDIRS), ) 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),) ifeq ($(NO_RECIPES),)
$$(foreach d, $$($1_$2_TOPDIRS), \ $$(foreach d, $$($1_$2_TOPDIRS), \
$$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2,$$d))) $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2,$$d)))

5
make/common/SetupJavaCompilers.gmk
View File

@ -38,7 +38,10 @@ JAVAC_WARNINGS := -Xlint:all -Werror
# and the interim javac, to be run by the boot jdk. # and the interim javac, to be run by the boot jdk.
$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ $(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
JAVAC := $(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, \ -Xlint:all$(COMMA)-deprecation$(COMMA)-options -Werror, \
DISABLE_SJAVAC := true, \ DISABLE_SJAVAC := true, \
)) ))