diff options
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libjava/configure b/libjava/configure index 076a4a00d41..1373373f0bf 100755 --- a/libjava/configure +++ b/libjava/configure @@ -13275,7 +13275,6 @@ NATIVE=yes # Which gcj do we use? which_gcj=default built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" -built_hostdir="`cd ${builddotdot}/../../${host_subdir} && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't # use ac_exeext, because that is for the target platform. @@ -13314,10 +13313,8 @@ fi case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" - # GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' - GCJH="$built_gcc_dir/gcjh" - # ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar' - ZIP="$built_hostdir/fastjar/fastjar" + GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' + ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then @@ -13334,7 +13331,7 @@ case "${which_gcj}" in GCJ="gcj -B`${PWDCMD-pwd}`/" ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' + ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' GCJH=gcjh ;; esac @@ -17575,6 +17572,12 @@ case " $CONFIG_FILES " in ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ;; esac +for ac_multi_file in $CONFIG_FILES; do + case $ac_multi_file in + */Makefile) + grep "^MULTI[^ ]* =" Makefile >> "$ac_multi_file" ;; + esac +done ;; esac done |
