changeset 1672:2b82d45d1ab8

Merge
author alanb
date Tue, 03 May 2016 10:39:00 +0100
parents 5267e9181161 b7643d5bbe19
children 51865518fa99
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/BuildNashorn.gmk	Thu Apr 28 09:38:42 2016 -0700
+++ b/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/test/TEST.ROOT	Thu Apr 28 09:38:42 2016 -0700
+++ b/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