configure.in (topsrcdir): New.

* configure.in (topsrcdir): New.
        (configdirs): Check ${topsrcdir}/gcc instead.
        (config-ml.in): Use ${topsrcdir}/config-ml.in.
        * tests/configure.in (topsrcdir): New.
        (check): Check ${topsrcdir}/gcc instead.
Fixes multilib problems when srcdir == objdir.

From-SVN: r17505
This commit is contained in:
H.J. Lu 1998-01-27 09:28:32 +00:00 committed by Jeff Law
parent 7b6ffd1189
commit 3fdcc721ff
3 changed files with 33 additions and 13 deletions

View File

@ -1,3 +1,12 @@
Tue Jan 27 10:29:44 1998 H.J. Lu (hjl@gnu.org)
* configure.in (topsrcdir): New.
(configdirs): Check ${topsrcdir}/gcc instead.
(config-ml.in): Use ${topsrcdir}/config-ml.in.
* tests/configure.in (topsrcdir): New.
(check): Check ${topsrcdir}/gcc instead.
Sun Jan 25 14:01:50 1998 Jason Merrill <jason@yorick.cygnus.com>
* std/bastring.h (unique): We only need length bytes.

View File

@ -2,7 +2,17 @@
# necessary for a configure script to process the program in
# this directory. For more information, look at ../configure.
if [ -d ${srcdir}/../gcc ] ; then
if [ "${srcdir}" = "." ] ; then
if [ "${with_target_subdir}" != "." ] ; then
topsrcdir=${with_multisrctop}../..
else
topsrcdir=${with_multisrctop}..
fi
else
topsrcdir=${srcdir}/..
fi
if [ -d ${topsrcdir}/gcc ] ; then
configdirs="tests testsuite"
else
configdirs="tests"
@ -86,12 +96,4 @@ if [ -n "${with_cross_host}" ] ; then
mv -f Makefile.tem Makefile
fi
if [ "${srcdir}" = "." ] ; then
if [ "${with_target_subdir}" != "." ] ; then
. ${with_multisrctop}../../config-ml.in
else
. ${with_multisrctop}../config-ml.in
fi
else
. ${srcdir}/../config-ml.in
fi
. ${topsrcdir}/config-ml.in

View File

@ -43,7 +43,18 @@ for TEST in ${TESTS} ; do
echo ' diff -c $(srcdir)/'"${TEST}.exp ${TEST}.out" >>Makefile
CHECK="${CHECK} check-${TEST}"
done
if [ -d ${srcdir}/../../gcc ] ; then
if [ "${srcdir}" = "." ] ; then
if [ "${with_target_subdir}" != "." ] ; then
topsrcdir=${with_multisrctop}../../..
else
topsrcdir=${with_multisrctop}../..
fi
else
topsrcdir=${srcdir}/../..
fi
if [ -d ${topsrcdir}/gcc ] ; then
echo "
check:
check-old: ${CHECK}" >>Makefile
@ -51,5 +62,3 @@ else
echo "
check: ${CHECK}" >>Makefile
fi