From: Jason Merrill <jason@redhat.com>
Date: Thu, 23 Aug 2001 22:35:52 +0000 (-0400)
Subject: testsuite_flags.in (build-includes): Re-add backward.
X-Git-Tag: prereleases/libstdc++-3.0.95~2460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22ec5294d5301902b4c0733f58cdf4dd8db35f1;p=thirdparty%2Fgcc.git

testsuite_flags.in (build-includes): Re-add backward.

        * testsuite_flags.in (build-includes): Re-add backward.
(and back out earlier aclocal change)

From-SVN: r45139
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4713cf9ba5af..95b7ad92895c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,6 @@
 2001-08-23  Jason Merrill  <jason_merrill@redhat.com>
 
-	* aclocal.m4 (GLIBCPP_INCLUDES): Include backward.
+	* testsuite_flags.in (build-includes): Re-add backward.
 
 2001-08-22  Benjamin Kosnik  <bkoz@redhat.com>
 
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 028f6430fb23..b83c7a76c966 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1613,8 +1613,7 @@ dnl
 dnl GLIBCPP_EXPORT_INCLUDES
 AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include \
-		    -I${glibcpp_builddir}/include/backward"
+  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 83559ad7107a..cbd02b480b86 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17395,8 +17395,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
 # Export all the include and flag information to makefiles.
 
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include \
-		    -I${glibcpp_builddir}/include/backward"
+  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then
diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in
index 553a43332902..335e08585cd7 100755
--- a/libstdc++-v3/testsuite_flags.in
+++ b/libstdc++-v3/testsuite_flags.in
@@ -34,6 +34,7 @@ case ${query} in
     --build-includes)
       INCLUDES="-nostdinc++ @GLIBCPP_INCLUDES@
 	        -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio 
+		-I${SRC_DIR}/include/backward 
 		-I${SRC_DIR}/testsuite -I${BUILD_DIR}/testsuite"
       echo ${INCLUDES}
       ;;