From 39116e15eab6b5bcc63807941d5a70615cd50a66 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 21 Dec 2004 15:49:39 +0000
Subject: [PATCH] Make bootclasspath construction in <javac> take
 build.sysclasspath into account.  Probably needs to get used in all other
 tasks supporting bootclasspath as well.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277260 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java | 7 ++++---
 src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java | 5 +++--
 src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
index d3be0807d..d3779da51 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
@@ -52,10 +52,11 @@ public class Gcj extends DefaultCompilerAdapter {
 
         // gcj doesn't support bootclasspath dir (-bootclasspath)
         // so we'll emulate it for compatibility and convenience.
-        if (bootclasspath != null) {
-            classpath.append(bootclasspath);
+        Path p = getBootClassPath();
+        if (p.size() > 0) {
+            classpath.append(p);
         }
-
+        
         // gcj doesn't support an extension dir (-extdir)
         // so we'll emulate it for compatibility and convenience.
         classpath.addExtdirs(extdirs);
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
index f5210443c..b9fc4bb99 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
@@ -43,8 +43,9 @@ public class Jvc extends DefaultCompilerAdapter {
 
         // jvc doesn't support bootclasspath dir (-bootclasspath)
         // so we'll emulate it for compatibility and convenience.
-        if (bootclasspath != null) {
-            classpath.append(bootclasspath);
+        Path p = getBootClassPath();
+        if (p.size() > 0) {
+            classpath.append(p);
         }
 
         if (includeJavaRuntime) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
index abfbda867..9ac6d8c99 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
@@ -91,8 +91,9 @@ public class Kjc extends DefaultCompilerAdapter {
         Path cp = new Path(project);
 
         // kjc don't have bootclasspath option.
-        if (bootclasspath != null) {
-            cp.append(bootclasspath);
+        Path p = getBootClassPath();
+        if (p.size() > 0) {
+            cp.append(p);
         }
 
         if (extdirs != null) {