--- a/langtools/make/Makefile	Mon Apr 20 19:01:35 2009 +0100
+++ b/langtools/make/Makefile	Wed May 06 18:04:08 2009 +0100
@@ -107,7 +107,7 @@
 
 ifeq ($(DEBUG_CLASSFILES), true)
   ANT_OPTIONS += -Djavac.debug=true
-  ANT_OPTIONS += -Djavac.debuglevel=source,lines,vars
+  ANT_OPTIONS += -Ddebug.classfiles=true
 endif
 
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)

--- a/langtools/make/build.xml	Mon Apr 20 19:01:35 2009 +0100
+++ b/langtools/make/build.xml	Wed May 06 18:04:08 2009 +0100
@@ -32,6 +32,13 @@
 
 <project name="langtools" default="build" basedir="..">
     
+    <!-- Force full debuginfo for javac if the debug.classfiles
+    property is set.  This must be BEFORE the include of
+    build.properties because it sets javac.debuglevel.  -->
+    <condition property="javac.debuglevel" value="source,lines,vars">
+        <equals arg1="${debug.classfiles}" arg2="true"/>
+    </condition>
+
     <!-- The following locations can be used to override default property values. -->
 
     <!-- Use this location for customizations specific to this instance of this workspace -->