Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1415:330ddba6ffc4
8065912: Better handling of classpath in build-infra
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Wed, 09 Sep 2015 09:36:48 +0200 |
| parents | 37a9addb8c8d |
| children | a750a66640e0 |
| files | make/BuildNashorn.gmk |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/BuildNashorn.gmk Mon Sep 07 20:07:03 2015 +0530 +++ b/make/BuildNashorn.gmk Wed Sep 09 09:36:48 2015 +0200 @@ -31,7 +31,7 @@ include JavaCompilation.gmk include SetupJavaCompilers.gmk -JDK_CLASSES := $(subst $(SPACE),$(PATH_SEP),$(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \ +JDK_CLASSES := $(call PathList, $(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \ java.base java.logging java.scripting))) NASHORN_JAR := $(IMAGES_OUTPUTDIR)/nashorn.jar @@ -48,7 +48,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ JVM := $(JAVA), \ JAVAC := $(NEW_JAVAC), \ - FLAGS := -g -source 8 -target 8 -bootclasspath "$(JDK_CLASSES)", \ + FLAGS := -g -source 8 -target 8 -bootclasspath $(JDK_CLASSES), \ SERVER_DIR := $(SJAVAC_SERVER_DIR), \ SERVER_JVM := $(SJAVAC_SERVER_JAVA))) @@ -86,7 +86,8 @@ $(RM) -rf $(@D)/jdk $(@D)/netscape $(CP) -R -p $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes/* $(@D)/ $(FIXPATH) $(JAVA) \ - -Xbootclasspath/p:"$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes" \ + -Xbootclasspath/p:$(call PathList, $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \ + $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes) \ jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D) $(TOUCH) $@