Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoralanb
Tue, 03 May 2016 10:39:00 +0100
changeset 37828 3a06bcd89461
parent 37761 82b8d12a553f (current diff)
parent 37827 09fa0c82a5f7 (diff)
child 37829 cd05ec7e2b76
Merge
--- a/nashorn/make/BuildNashorn.gmk	Wed Jul 05 21:39:33 2017 +0200
+++ b/nashorn/make/BuildNashorn.gmk	Tue May 03 10:39:00 2016 +0100
@@ -76,9 +76,10 @@
 ifeq ($(BOOT_JDK_MODULAR), true)
   NASGEN_OPTIONS := \
       -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
-      -Xpatch:$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
+      -Xpatch:java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
       -XaddExports:java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
-      -XaddExports:java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED
+      -XaddExports:java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
+      #
 else
   NASGEN_OPTIONS := \
       -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes
--- a/nashorn/test/TEST.ROOT	Wed Jul 05 21:39:33 2017 +0200
+++ b/nashorn/test/TEST.ROOT	Tue May 03 10:39:00 2016 +0100
@@ -8,4 +8,4 @@
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=4.2 b01
+requiredVersion=4.2 b02
jdk-sandbox