mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
8361216: Do not fork javac in J2DBench ant build
Reviewed-by: prr
This commit is contained in:
parent
6e203384f8
commit
7282f68cee
@ -31,10 +31,10 @@
|
||||
|
||||
|
||||
ifndef SOURCE
|
||||
export SOURCE := 7
|
||||
export SOURCE := 8
|
||||
endif
|
||||
ifndef TARGET
|
||||
export TARGET := 7
|
||||
export TARGET := 8
|
||||
endif
|
||||
ifndef JAVAC
|
||||
export JAVAC := javac
|
||||
|
||||
@ -39,12 +39,12 @@
|
||||
<property name="dist" location="dist"/>
|
||||
<property name="resources" location="resources"/>
|
||||
|
||||
<condition property="source" value="7">
|
||||
<condition property="source" value="8">
|
||||
<not>
|
||||
<isset property="source"/>
|
||||
</not>
|
||||
</condition>
|
||||
<condition property="target" value="7">
|
||||
<condition property="target" value="8">
|
||||
<not>
|
||||
<isset property="target"/>
|
||||
</not>
|
||||
@ -54,11 +54,6 @@
|
||||
<isset property="java"/>
|
||||
</not>
|
||||
</condition>
|
||||
<condition property="javac" value="javac">
|
||||
<not>
|
||||
<isset property="javac"/>
|
||||
</not>
|
||||
</condition>
|
||||
|
||||
<target name="init">
|
||||
<!-- Create the time stamp -->
|
||||
@ -70,7 +65,7 @@
|
||||
<target name="compile" depends="init"
|
||||
description="compile the source " >
|
||||
<!-- Compile the java code from ${src} into ${build} -->
|
||||
<javac debug="off" source="${source}" target="${target}" srcdir="${src}" destdir="${build}" fork="true" executable="${javac}"/>
|
||||
<javac debug="off" source="${source}" target="${target}" srcdir="${src}" destdir="${build}"/>
|
||||
</target>
|
||||
|
||||
<target name="run" depends="dist"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user