# HG changeset patch
# User tbell
# Date 1258482230 28800
# Node ID 5b4968c110476085225d3a71c4210fad2c1116c1
# Parent  701ccbf55ae574ca54e54c1583cf91f0d0ea21e5# Parent  4023edcd8433c06eac502cf871aa63ef9c4fed30
Merge

diff -r 701ccbf55ae5 -r 5b4968c11047 build.properties
--- a/build.properties	Thu Nov 12 15:35:47 2009 -0800
+++ b/build.properties	Tue Nov 17 10:23:50 2009 -0800
@@ -34,6 +34,10 @@
 # one of the standard user build.properties files (see build.xml)
 javac.jar=${bootstrap.dir}/lib/javac.jar
 
+# The tools.jar is needed in the classpath to compile these sources
+jdk.home=${java.home}/..
+tools.jar=${jdk.home}/lib/tools.jar
+
 # options for the <javac> tasks used to compile the tools
 javac.source = 7
 javac.target = 7
diff -r 701ccbf55ae5 -r 5b4968c11047 build.xml
--- a/build.xml	Thu Nov 12 15:35:47 2009 -0800
+++ b/build.xml	Tue Nov 17 10:23:50 2009 -0800
@@ -113,7 +113,10 @@
     <!-- Build (compilation) of sources to class files. -->
     <target name="build"
 	    depends="init, -init-src-dirs, -build-prep">
-        <javac fork="true"
+        <javac 
+	     includeAntRuntime="false" 
+	     classpath="${build.classes.dir}:${tools.jar}"
+	     fork="true"
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
diff -r 701ccbf55ae5 -r 5b4968c11047 make/Makefile
--- a/make/Makefile	Thu Nov 12 15:35:47 2009 -0800
+++ b/make/Makefile	Tue Nov 17 10:23:50 2009 -0800
@@ -113,11 +113,13 @@
 ifdef ALT_LANGTOOLS_DIST
   ifdef ALT_BOOTDIR
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
+    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
   endif
   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
 else
   ifdef ALT_JDK_IMPORT_PATH
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
+    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
   endif
 endif
 
@@ -141,7 +143,7 @@
 
 # Create a make target for each
 $(ANT_TARGETS):
-	cd .. && $(ANT_JAVA_HOME) $(ANT) -version
+	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
 	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
 
 # Help target