# HG changeset patch
# User jjg
# Date 1262985285 28800
# Node ID 96c56220dcc216f6821fb9d0199d97fe337bb6b3
# Parent  aa06467be3a260897f9ae4b1f84374c73dea6894
6915152: langtools build failures with import.jdk on Windows
Reviewed-by: ohair

diff -r aa06467be3a2 -r 96c56220dcc2 make/build.xml
--- a/make/build.xml	Fri Jan 08 11:32:57 2010 -0800
+++ b/make/build.xml	Fri Jan 08 13:14:45 2010 -0800
@@ -107,14 +107,21 @@
         ignoresystemclasses="true"
         classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
 
+    <!-- Set the default value of the sourcepath used for javac. -->
     <condition property="javac.sourcepath" value="${build.genstubs.dir}" else="">
         <isset property="import.jdk.src.dir"/>
     </condition>
 
+    <!-- Set the default value of the classpath used for javac. -->
     <property name="javac.classpath" value=""/>
 
+    <!-- Set the default bootclasspath option used for javac. 
+	Note that different variants of the option are used, meaning we can't just 
+	define the value for the option.
+	Note the explicit use of the standard property ${path.separator} in the following.
+	This is because Ant is not clever enough to handle direct use of : or ; -->
     <condition property="javac.bootclasspath.opt"
-            value="-Xbootclasspath:${build.classes.dir}:${import.jdk.jar}"
+            value="-Xbootclasspath:${build.classes.dir}${path.separator}${import.jdk.jar}"
             else="-Xbootclasspath/p:${build.classes.dir}">
         <isset property="import.jdk.jar"/>
     </condition>