From 49f0e7fc38e04166a59946405ae469b1abd93f4e Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 19 Jul 2016 13:12:50 +0200
Subject: [PATCH] 8160953: Update build-nagen-eclipse task to work with JDK 9

Reviewed-by: lagergren, sundar
---
 nashorn/make/build-nasgen.xml | 4 ++--
 nashorn/make/build.xml        | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nashorn/make/build-nasgen.xml b/nashorn/make/build-nasgen.xml
index 9b3286ec2c7..d233f55c0a2 100644
--- a/nashorn/make/build-nasgen.xml
+++ b/nashorn/make/build-nasgen.xml
@@ -43,14 +43,14 @@
         </java>
     </target>
 
-    <target name="run-nasgen-eclipse">
+    <target name="run-nasgen-eclipse" depends="load-properties">
         <mkdir dir="${basedir}/build/eclipse/.nasgentmp"/>
 
         <java classname="jdk.nashorn.internal.tools.nasgen.Main" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
             </classpath>
-            <jvmarg value="-Xbootclasspath/p:${basedir}/build/eclipse"/>
+            <jvmarg line="${nasgen.module.imports}"/>
             <arg value="${basedir}/build/eclipse"/>
             <arg value="jdk.nashorn.internal.objects"/>
             <arg value="${basedir}/build/eclipse/.nasgentmp"/>
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 0ece37f415f..b502e8bdd93 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -27,11 +27,14 @@
   <import file="build-nasgen.xml"/>
   <import file="code_coverage.xml"/>
 
-  <target name="init-conditions">
+  <target name="load-properties">
     <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
     <property file="${user.home}/.nashorn.project.local.properties"/>
 
     <loadproperties srcFile="make/project.properties"/>
+  </target>
+
+  <target name="init-conditions" depends="load-properties">
     <path id="nashorn.jar.path">
          <pathelement location="${nashorn.jar}"/>
     </path>