Browse Source

I've forgotten that one can set <javac>'s fork option via

build.compiler as well.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272526 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
2c172d974f
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

+ 4
- 0
src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -472,6 +472,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
protected boolean assumeJava11() { protected boolean assumeJava11() {
return "javac1.1".equals(attributes.getCompilerVersion()) || return "javac1.1".equals(attributes.getCompilerVersion()) ||
("classic".equals(attributes.getCompilerVersion()) ("classic".equals(attributes.getCompilerVersion())
&& JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) ||
("extJavac".equals(attributes.getCompilerVersion())
&& JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)); && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1));
} }


@@ -482,6 +484,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
protected boolean assumeJava12() { protected boolean assumeJava12() {
return "javac1.2".equals(attributes.getCompilerVersion()) || return "javac1.2".equals(attributes.getCompilerVersion()) ||
("classic".equals(attributes.getCompilerVersion()) ("classic".equals(attributes.getCompilerVersion())
&& JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)) ||
("extJavac".equals(attributes.getCompilerVersion())
&& JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)); && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2));
} }




Loading…
Cancel
Save