From 2c172d974fae6c3b8b573932642b81d95da969a2 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 19 Apr 2002 12:12:57 +0000
Subject: [PATCH] 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
---
 .../tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index c7e011ba3..318863f88 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -472,6 +472,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
     protected boolean assumeJava11() {
         return "javac1.1".equals(attributes.getCompilerVersion()) ||
             ("classic".equals(attributes.getCompilerVersion()) 
+             && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) ||
+            ("extJavac".equals(attributes.getCompilerVersion()) 
              && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1));
     }
 
@@ -482,6 +484,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
     protected boolean assumeJava12() {
         return "javac1.2".equals(attributes.getCompilerVersion()) ||
             ("classic".equals(attributes.getCompilerVersion()) 
+             && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)) ||
+            ("extJavac".equals(attributes.getCompilerVersion()) 
              && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2));
     }