diff options
| author | Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> | 2010-08-27 04:27:40 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2010-08-27 04:27:40 +0000 |
| commit | 9f8f1def9dd5d303a437397c5e1aaa60aef468d9 (patch) | |
| tree | f65631ede4a921c4935389a45f2258cc29d1a33d /libjava/configure.ac | |
| parent | a703b0c023a06afd8ef823feda674b952228b842 (diff) | |
| download | gcc-9f8f1def9dd5d303a437397c5e1aaa60aef468d9.zip gcc-9f8f1def9dd5d303a437397c5e1aaa60aef468d9.tar.gz gcc-9f8f1def9dd5d303a437397c5e1aaa60aef468d9.tar.bz2 | |
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 <Ralf.Wildenhues@gmx.de>
From-SVN: r163580
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
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) |