diff options
| author | Mike Stump <mrs@apple.com> | 2005-03-27 00:49:23 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2005-03-27 00:49:23 +0000 |
| commit | e5022f0dcc0471672a62bd7618bf813cd84c7f98 (patch) | |
| tree | 1a4608d950c7ae434b1519aa000a5b624cdb58b0 /libjava | |
| parent | e732e137e01b6e582b85d56932946742f46b2d9b (diff) | |
| download | gcc-e5022f0dcc0471672a62bd7618bf813cd84c7f98.zip gcc-e5022f0dcc0471672a62bd7618bf813cd84c7f98.tar.gz gcc-e5022f0dcc0471672a62bd7618bf813cd84c7f98.tar.bz2 | |
configure.ac: Fix ZIP and GCJH at configure time to absolute paths like we do for the compiler...
* configure.ac: Fix ZIP and GCJH at configure time to absolute
paths like we do for the compiler, as we use it in external/sax
and it doesn't get MULTIBUILDTOP right when multilibing.
From-SVN: r97091
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rwxr-xr-x | libjava/configure | 7 | ||||
| -rw-r--r-- | libjava/configure.ac | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e7de362..5b76363 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-03-25 Mike Stump <mrs@apple.com> + + * configure.ac: Fix ZIP and GCJH at configure time to absolute + paths like we do for the compiler, as we use it in external/sax + and it doesn't get MULTIBUILDTOP right when multilibing. + 2005-03-24 Anthony Green <green@redhat.com> * gnu/gcj/tools/gcj_dbtool/Main.java: Accept libdir argument with 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 diff --git a/libjava/configure.ac b/libjava/configure.ac index 8366523..9f16149 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1029,6 +1029,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. @@ -1067,8 +1068,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 |