Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1783:e3b11296395b 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:52 +0200 |
parents | fc972ab7d939 |
children | 430dee99064d 7f5887b2f7a8 |
files | make/BuildNashorn.gmk |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/BuildNashorn.gmk Tue Oct 04 13:23:10 2016 +0200 +++ b/make/BuildNashorn.gmk Tue Oct 04 13:41:52 2016 +0200 @@ -26,7 +26,7 @@ # This must be the first rule default: all --include $(SPEC) +include $(SPEC) include MakeBase.gmk include JarArchive.gmk include JavaCompilation.gmk @@ -42,7 +42,7 @@ # Need to use source and target 8 for nasgen to work. $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ - JVM := $(JAVA), \ + JVM := $(JAVA_JAVAC), \ JAVAC := $(NEW_JAVAC), \ FLAGS := -g -source 9 -target 9 --upgrade-module-path "$(JDK_OUTPUTDIR)/modules/" \ --system none --module-source-path "$(MODULESOURCEPATH)", \ @@ -91,7 +91,7 @@ $(MKDIR) -p $(@D) $(RM) -rf $(@D)/jdk $(@D)/netscape $(CP) -R -p $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/* $(@D)/ - $(JAVA) $(NASGEN_OPTIONS) \ + $(JAVA_SMALL) $(NASGEN_OPTIONS) \ jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D) $(TOUCH) $@