aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/configure')
-rwxr-xr-xlibjava/configure7
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/configure b/libjava/configure
index d689da0..076a4a0 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -13275,6 +13275,7 @@ 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.
@@ -13313,8 +13314,10 @@ fi
case "${which_gcj}" in
built)
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
- GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
- ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
+ # GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
+ GCJH="$built_gcc_dir/gcjh"
+ # ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
+ ZIP="$built_hostdir/fastjar/fastjar"
;;
cross)
if test "x${with_newlib}" = "xyes"; then