This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: PATCH: Libjava is broken again
- From: Matthias Klose <doko at cs dot tu-berlin dot de>
- To: Paolo Bonzini <bonzini at gnu dot org>
- Cc: "H. J. Lu" <hjl at lucon dot org>, gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Mon, 4 Jun 2007 10:30:36 +0200
- Subject: Re: PATCH: Libjava is broken again
- References: <20070604030226.GA26134@lucon.org> <20070604034531.GA18886@lucon.org> <4663C799.3040002@gnu.org>
Paolo Bonzini writes:
> >> - if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx && test "x${user_specified_javac}" != xecj; then
> >> - AC_MSG_ERROR([cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj, or --with-gcjx])
> >> +dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then
> >> + if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
> >>
> >> changes to check ${ECJ} instead of ${GCJ}, which breaks libjava
> >> build.
> >
> > This patch works for me.
>
> Looks like a merge hiccup, your patch may work but it probably is not
> what Matthias intended to do.
The patch looks ok: prefer GCJ, as done in classpath/{lib,tools}/Makefile.am.
Apparently the merge did succeed without conflicts and I didn't
notice, having ecj in the path as well.
Please mark the section with ## GCJ LOCAL / ## END GCJ LOCAL.
I cannot approve the patch, but would like to see it checked in,
fixing a bootstrap error.
Changes from the classpath import are not explicitely mentioned in the
libjava ChangeLogs, these should be in libjava/classpath/ChangeLog,
maybe its better to include these in the commit message too.
Matthias