A libstdc++ patch for multilib

H.J. Lu hjl@lucon.org
Fri Jan 23 21:26:00 GMT 1998


This patch should correctly locate the gcc source in
all cases.

Thanks.


-- 
H.J. Lu (hjl@gnu.org)
--
Fri Jan 23 08:03:52 1997  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.

Index: tests/configure.in
===================================================================
RCS file: /home/work/cvs/gnu/egcs/libstdc++/tests/configure.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 configure.in
--- configure.in	1998/01/16 17:12:28	1.1.1.2
+++ configure.in	1998/01/23 20:07:22
@@ -43,7 +43,18 @@
   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 @@
   echo "
 check: ${CHECK}" >>Makefile
 fi
-
-
Index: configure.in
===================================================================
RCS file: /home/work/cvs/gnu/egcs/libstdc++/configure.in,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 configure.in
--- configure.in	1998/01/16 17:12:07	1.1.1.5
+++ configure.in	1998/01/23 20:05:21
@@ -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 @@
     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



More information about the Gcc mailing list