diff -r ec60c3290242 -r 7c84df693837 jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
--- a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk	Thu Apr 28 08:26:38 2016 -0700
+++ b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk	Tue May 03 09:09:57 2016 +0100
@@ -27,6 +27,6 @@
 
 $(eval $(call SetupBuildLauncher, jjs, \
     MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
-    JAVA_ARGS := -addmods ALL-SYSTEM, \
+    JAVA_ARGS := -addmods ALL-DEFAULT, \
     CFLAGS := -DENABLE_ARG_FILES, \
 ))