OSDN Git Service

* configure.ac: Fix ZIP and GCJH at configure time to absolute
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 27 Mar 2005 00:49:23 +0000 (00:49 +0000)
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 27 Mar 2005 00:49:23 +0000 (00:49 +0000)
        paths like we do for the compiler, as we use it in external/sax
        and it doesn't get MULTIBUILDTOP right when multilibing.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97091 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/configure
libjava/configure.ac

index e7de362..5b76363 100644 (file)
@@ -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
index d689da0..076a4a0 100755 (executable)
@@ -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.
 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
index 8366523..9f16149 100644 (file)
@@ -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