aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2001-08-23 18:35:52 -0400
committerJason Merrill <jason@gcc.gnu.org>2001-08-23 18:35:52 -0400
commitd22ec5294d5301902b4c0733f58cdf4dd8db35f1 (patch)
tree215a3a954fc2e093d91e2d1287a2dc7aa6c45eda
parent3b63eac49f5f48cfb39de9a79b60754f4a41d659 (diff)
downloadgcc-d22ec5294d5301902b4c0733f58cdf4dd8db35f1.zip
gcc-d22ec5294d5301902b4c0733f58cdf4dd8db35f1.tar.gz
gcc-d22ec5294d5301902b4c0733f58cdf4dd8db35f1.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog2
-rw-r--r--libstdc++-v3/aclocal.m43
-rwxr-xr-xlibstdc++-v3/configure3
-rwxr-xr-xlibstdc++-v3/testsuite_flags.in1
4 files changed, 4 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4713cf9..95b7ad9 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 028f643..b83c7a7 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 83559ad..cbd02b4 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 553a433..335e085 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}
;;