/hg/icedtea6: Don't add generated dir to bootclasspath in langto...

[mjw at icedtea.classpath.org]

changeset 7c740ee6ff74 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7c740ee6ff74
author: Mark Wielaard <mark at klomp.org>
date: Mon Mar 01 09:41:01 2010 +0100

	Don't add generated dir to bootclasspath in
	langtools/make/build.xml.

	2010-03-01 Mark Wielaard <mark at klomp.org>

	 * patches/ecj/icedtea.patch: Don't add generated dir to
	bootclasspath in langtools/make/build.xml.


diffstat:

2 files changed, 7 insertions(+), 2 deletions(-)
ChangeLog                 |    5 +++++
patches/ecj/icedtea.patch |    4 ++--

diffs (33 lines):

diff -r b849c299f6ff -r 7c740ee6ff74 ChangeLog
--- a/ChangeLog	Fri Feb 26 21:56:21 2010 +0100
+++ b/ChangeLog	Mon Mar 01 09:41:01 2010 +0100
@@ -1,3 +1,8 @@ 2010-02-26  Mark Wielaard  <mark at klomp.o
+2010-03-01  Mark Wielaard  <mark at klomp.org>
+
+	* patches/ecj/icedtea.patch: Don't add generated dir to
+	bootclasspath in langtools/make/build.xml.
+
 2010-02-26  Mark Wielaard  <mark at klomp.org>
 
 	* patches/openjdk/6928623-verbose-langtools.patch: New patch.
diff -r b849c299f6ff -r 7c740ee6ff74 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch	Fri Feb 26 21:56:21 2010 +0100
+++ b/patches/ecj/icedtea.patch	Mon Mar 01 09:41:01 2010 +0100
@@ -902,7 +902,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
                         includeAntRuntime="no"
                         source="@{javac.source}"
                         target="@{javac.target}">
-+		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
++		    <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg line="${javac.version.opt}"/>
                      <compilerarg line="-Xlint"/>
@@ -910,7 +910,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
                         target="@{javac.target}"
                         debug="${javac.debug}"
                         debuglevel="${javac.debuglevel}">
-+		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
++		    <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
                      <compilerarg line="${javac.no.jdk.warnings}"/>