Mercurial > hg > release > icedtea6-1.11

changeset 1950:7c740ee6ff74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't add generated dir to bootclasspath in langtools/make/build.xml. 2010-03-01 Mark Wielaard <mark@klomp.org> * patches/ecj/icedtea.patch: Don't add generated dir to bootclasspath in langtools/make/build.xml.
author Mark Wielaard <mark@klomp.org>
date Mon, 01 Mar 2010 09:41:01 +0100
parents b849c299f6ff
children 917e99004afb 9e8951cefda4
files ChangeLog patches/ecj/icedtea.patch
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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-03-01  Mark Wielaard  <mark@klomp.org>
+
+	* patches/ecj/icedtea.patch: Don't add generated dir to
+	bootclasspath in langtools/make/build.xml.
+
 2010-02-26  Mark Wielaard  <mark@klomp.org>
 
 	* patches/openjdk/6928623-verbose-langtools.patch: New 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 @@
                         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 @@
                         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}"/>