Mercurial > hg > release > icedtea7-2.5
changeset 2701:a7f6247d3dff
PR1726: configure fails looking for ecj.jar before even trying to find javac
2014-03-28 Andrew John Hughes <gnu.andrew@redhat.com>
* acinclude.m4:
(IT_FIND_COMPILER): Check value of ECJ_JAR
and JAVAC here ...
(IT_FIND_ECJ_JAR): ... rather than here where
${JAVAC} may not yet be defined.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 28 Mar 2014 18:19:20 +0000 |
| parents | 715ae9b63c91 |
| children | 984ebd417db7 |
| files | ChangeLog NEWS acinclude.m4 |
| diffstat | 3 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 28 18:17:41 2014 +0000 +++ b/ChangeLog Fri Mar 28 18:19:20 2014 +0000 @@ -1,3 +1,11 @@ +2014-03-28 Andrew John Hughes <gnu.andrew@redhat.com> + + * acinclude.m4: + (IT_FIND_COMPILER): Check value of ECJ_JAR + and JAVAC here ... + (IT_FIND_ECJ_JAR): ... rather than here where + ${JAVAC} may not yet be defined. + 2014-03-28 Andrew John Hughes <gnu.andrew@member.fsf.org> * acinclude.m4:
--- a/NEWS Fri Mar 28 18:17:41 2014 +0000 +++ b/NEWS Fri Mar 28 18:19:20 2014 +0000 @@ -160,6 +160,7 @@ - PR1677, G498288: Update PaX support to detect running PaX kernel and use newer tools - PR1679: Allow OpenJDK to build on PaX-enabled kernels - PR1684: Build fails with empty PAX_COMMAND + - PR1726: configure fails looking for ecj.jar before even trying to find javac * PPC & AIX port - Add AIX-specific build instructions to README-ppc.html - Added AIX as testing platform for more jtreg tests written in shell-script
--- a/acinclude.m4 Fri Mar 28 18:17:41 2014 +0000 +++ b/acinclude.m4 Fri Mar 28 18:19:20 2014 +0000 @@ -134,6 +134,12 @@ IT_USING_ECJ IT_WITH_GCJ + if test "x${ECJ_JAR}" = "xno"; then + if test "x${JAVAC}" = "x"; then + AC_MSG_ERROR("No compiler or ecj JAR file was found.") + fi + fi + if test x"${GCJ}" != xno ; then JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main" fi @@ -350,11 +356,6 @@ fi fi AC_MSG_RESULT(${ECJ_JAR}) - if test "x${ECJ_JAR}" = "xno"; then - if test "x${JAVAC}" = "x"; then - AC_MSG_ERROR("No compiler or ecj JAR file was found.") - fi - fi AC_SUBST(ECJ_JAR) ])