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
This commit is contained in:
parent
e732e137e0
commit
e5022f0dcc
|
@ -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>
|
2005-03-24 Anthony Green <green@redhat.com>
|
||||||
|
|
||||||
* gnu/gcj/tools/gcj_dbtool/Main.java: Accept libdir argument with
|
* gnu/gcj/tools/gcj_dbtool/Main.java: Accept libdir argument with
|
||||||
|
|
|
@ -13275,6 +13275,7 @@ NATIVE=yes
|
||||||
# Which gcj do we use?
|
# Which gcj do we use?
|
||||||
which_gcj=default
|
which_gcj=default
|
||||||
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
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
|
if test -n "${with_cross_host}"; then
|
||||||
# We are being configured with a cross compiler. We can't
|
# We are being configured with a cross compiler. We can't
|
||||||
# use ac_exeext, because that is for the target platform.
|
# use ac_exeext, because that is for the target platform.
|
||||||
|
@ -13313,8 +13314,10 @@ fi
|
||||||
case "${which_gcj}" in
|
case "${which_gcj}" in
|
||||||
built)
|
built)
|
||||||
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
||||||
GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
# GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||||
ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
GCJH="$built_gcc_dir/gcjh"
|
||||||
|
# ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||||
|
ZIP="$built_hostdir/fastjar/fastjar"
|
||||||
;;
|
;;
|
||||||
cross)
|
cross)
|
||||||
if test "x${with_newlib}" = "xyes"; then
|
if test "x${with_newlib}" = "xyes"; then
|
||||||
|
|
|
@ -1029,6 +1029,7 @@ NATIVE=yes
|
||||||
# Which gcj do we use?
|
# Which gcj do we use?
|
||||||
which_gcj=default
|
which_gcj=default
|
||||||
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
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
|
if test -n "${with_cross_host}"; then
|
||||||
# We are being configured with a cross compiler. We can't
|
# We are being configured with a cross compiler. We can't
|
||||||
# use ac_exeext, because that is for the target platform.
|
# use ac_exeext, because that is for the target platform.
|
||||||
|
@ -1067,8 +1068,10 @@ fi
|
||||||
case "${which_gcj}" in
|
case "${which_gcj}" in
|
||||||
built)
|
built)
|
||||||
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
||||||
GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
# GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||||
ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
GCJH="$built_gcc_dir/gcjh"
|
||||||
|
# ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||||
|
ZIP="$built_hostdir/fastjar/fastjar"
|
||||||
;;
|
;;
|
||||||
cross)
|
cross)
|
||||||
if test "x${with_newlib}" = "xyes"; then
|
if test "x${with_newlib}" = "xyes"; then
|
||||||
|
|
Loading…
Reference in New Issue