--- a/nashorn/make/build-nasgen.xml	Tue Mar 15 13:48:31 2016 -0700
+++ b/nashorn/make/build-nasgen.xml	Thu Mar 17 19:04:35 2016 +0000
@@ -35,13 +35,11 @@
             <classpath>
                 <pathelement location="${basedir}/jcov2/lib/jcov_j2se_rt.jar"/>
                 <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
-                <pathelement location="${dist.dir}/nasgen.jar"/>
-                <pathelement path="${build.dir}/classes"/>
             </classpath>
-            <jvmarg value="-Xbootclasspath/p:${basedir}/build/classes"/>
-            <arg value="${build.dir}/classes"/>
+            <jvmarg value="-XaddExports:${nasgen.module.imports}"/>
+            <arg value="${nashorn.module.classes.dir}"/>
             <arg value="jdk.nashorn.internal.objects"/>
-            <arg value="${build.dir}/classes"/>
+            <arg value="${nashorn.module.classes.dir}"/>
         </java>
     </target>