# HG changeset patch
# User ddehaven
# Date 1466020070 25200
# Node ID 6ec2b09ebf2079205580ac8ae0db7e68f207c558
# Parent  11d3d7e16f0e2f3f95dd57f0fac480724b1c6e2b# Parent  e4c63a49dbafbad81759352cc1f777e0113a0570
Merge

diff -r 11d3d7e16f0e -r 6ec2b09ebf20 langtools/make/netbeans/langtools/build.xml
--- a/langtools/make/netbeans/langtools/build.xml	Wed Jun 15 09:24:06 2016 -0700
+++ b/langtools/make/netbeans/langtools/build.xml	Wed Jun 15 12:47:50 2016 -0700
@@ -218,7 +218,11 @@
 
             <sequential>
                 <java fork="true" jvm="${langtools.jdk.home}/bin/java" classname="@{mainclass}">
-                    <jvmarg line="-Xpatch:@{build.modules}"/>
+                    <jvmarg line="-Xpatch:java.compiler=@{build.modules}/java.compiler"/>
+                    <jvmarg line="-Xpatch:jdk.compiler=@{build.modules}/jdk.compiler"/>
+                    <jvmarg line="-Xpatch:jdk.javadoc=@{build.modules}/jdk.javadoc"/>
+                    <jvmarg line="-Xpatch:jdk.jdeps=@{build.modules}/jdk.jdeps"/>
+                    <jvmarg line="-Xpatch:jdk.jshell=@{build.modules}/jdk.jshell"/>
                     <jvmarg line="@{jpda.jvmargs}"/>
                     <arg line="@{args}"/>
                 </java>