From 9f8f1def9dd5d303a437397c5e1aaa60aef468d9 Mon Sep 17 00:00:00 2001 From: Dmitrijs Ledkovs Date: Fri, 27 Aug 2010 04:27:40 +0000 Subject: Fix building ecjx in cross compile mode. libjava/: PR libgcj/40868 * configure.ac: Add GCC_FOR_ECJX variable. Ensure GCJ_FOR_ECJX is always set. * Makefile.am [!NATIVE] (ecjx.$(OBJEXT)): New rule. * Makefile.in: Regenerate. * configure: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. Co-Authored-By: Ralf Wildenhues From-SVN: r163580 --- libjava/configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index 685cb72..df6bca3 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -394,7 +394,8 @@ NATIVE=yes # Which gcj and host gcj (for ecjx) do we use? which_gcj=default host_exeext=${ac_exeext} -GCJ_FOR_ECJX= +GCJ_FOR_ECJX='$(GCJ)' +GCC_FOR_ECJX='$(CXX)' built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't @@ -402,6 +403,7 @@ if test -n "${with_cross_host}"; then NATIVE=no cross_host_exeext= GCJ_FOR_ECJX="${with_cross_host}-gcj" + GCC_FOR_ECJX="${with_cross_host}-gcc" case "${with_cross_host}" in *mingw* | *cygwin*) cross_host_exeext=.exe @@ -467,6 +469,7 @@ JAVAC="$GCJ -C" export JAVAC AC_SUBST(GCJ_FOR_ECJX) +AC_SUBST(GCC_FOR_ECJX) AC_SUBST(GCJH) AC_SUBST(host_exeext) -- cgit v1.1