diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-27 04:27:40 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-27 04:27:40 +0000 |
| commit | cda5fe864d366d244bbfb4da6d492cfc837dea7d (patch) | |
| tree | f65631ede4a921c4935389a45f2258cc29d1a33d /libjava/configure | |
| parent | 2f1887bd485c2c34b5f1e5bc300db4b9afaf0e23 (diff) | |
| download | gcc-cda5fe864d366d244bbfb4da6d492cfc837dea7d.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163580 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libjava/configure b/libjava/configure index 955332bb2d0..8fa4baffd68 100755 --- a/libjava/configure +++ b/libjava/configure @@ -773,6 +773,7 @@ LIBLTDL INCLTDL host_exeext GCJH +GCC_FOR_ECJX GCJ_FOR_ECJX X_AWT_FALSE X_AWT_TRUE @@ -6703,7 +6704,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 @@ -6711,6 +6713,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 @@ -6779,6 +6782,7 @@ export JAVAC + # Create it, so that compile/link tests don't fail test -f libgcj.spec || touch libgcj.spec @@ -13349,7 +13353,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13352 "configure" +#line 13356 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13455,7 +13459,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13458 "configure" +#line 13462 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19434,7 +19438,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19437 "configure" +#line 19441 "configure" struct S { ~S(); }; void bar(); void foo() |