diff options
| author | H.J. Lu <hjl@gnu.org> | 1998-01-27 09:28:32 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-01-27 02:28:32 -0700 |
| commit | 3fdcc721ffe53f9ed3c48fbf50c62a657d7472f3 (patch) | |
| tree | 78ef71c55f182335c942449e54151cd5a30ac1e1 /libstdc++ | |
| parent | 7b6ffd1189e854afec67a05baca2e1a58819b5b3 (diff) | |
| download | gcc-3fdcc721ffe53f9ed3c48fbf50c62a657d7472f3.tar.gz | |
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
Diffstat (limited to 'libstdc++')
| -rw-r--r-- | libstdc++/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++/configure.in | 22 | ||||
| -rw-r--r-- | libstdc++/tests/configure.in | 15 |
3 files changed, 33 insertions, 13 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index 88a4e9552c7..6f3d31a67b1 100644 --- a/libstdc++/ChangeLog +++ b/libstdc++/ChangeLog @@ -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. diff --git a/libstdc++/configure.in b/libstdc++/configure.in index 58b468e8ec8..352a94489d8 100644 --- a/libstdc++/configure.in +++ b/libstdc++/configure.in @@ -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 diff --git a/libstdc++/tests/configure.in b/libstdc++/tests/configure.in index f642f9f59b4..1266bd26fb3 100644 --- a/libstdc++/tests/configure.in +++ b/libstdc++/tests/configure.in @@ -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 - - |