6965264: langtools build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar
Reviewed-by: mcimadamore
This commit is contained in:
parent
949983f6b0
commit
0d2b8790d3
@ -621,7 +621,7 @@
|
|||||||
<genstubs
|
<genstubs
|
||||||
srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}"
|
srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}"
|
||||||
includes="${import.jdk.stub.files}"
|
includes="${import.jdk.stub.files}"
|
||||||
fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"
|
fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.core.lib}"
|
||||||
/>
|
/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
@ -813,7 +813,8 @@
|
|||||||
executable="${boot.java.home}/bin/javac"
|
executable="${boot.java.home}/bin/javac"
|
||||||
srcdir="${make.tools.dir}/CompileProperties"
|
srcdir="${make.tools.dir}/CompileProperties"
|
||||||
destdir="${build.toolclasses.dir}/"
|
destdir="${build.toolclasses.dir}/"
|
||||||
classpath="${ant.home}/lib/ant.jar"/>
|
classpath="${ant.core.lib}"
|
||||||
|
includeantruntime="false"/>
|
||||||
<taskdef name="pcompile"
|
<taskdef name="pcompile"
|
||||||
classname="CompilePropertiesTask"
|
classname="CompilePropertiesTask"
|
||||||
classpath="${build.toolclasses.dir}/"/>
|
classpath="${build.toolclasses.dir}/"/>
|
||||||
@ -827,7 +828,8 @@
|
|||||||
executable="${boot.java.home}/bin/javac"
|
executable="${boot.java.home}/bin/javac"
|
||||||
srcdir="${make.tools.dir}/GenStubs"
|
srcdir="${make.tools.dir}/GenStubs"
|
||||||
destdir="${build.toolclasses.dir}/"
|
destdir="${build.toolclasses.dir}/"
|
||||||
classpath="${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
|
classpath="${build.bootstrap.dir}/classes:${ant.core.lib}"
|
||||||
|
includeantruntime="false"/>
|
||||||
<taskdef name="genstubs"
|
<taskdef name="genstubs"
|
||||||
classname="GenStubs$$Ant"
|
classname="GenStubs$$Ant"
|
||||||
classpath="${build.toolclasses.dir}/"/>
|
classpath="${build.toolclasses.dir}/"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user