From 9f9359795c4ec1cec98ba86cf3bbacc35f28337f Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 14 Nov 2000 21:05:05 +0000 Subject: [PATCH] acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPOR): Set LIBS back to initial value. 2000-11-14 Benjamin Kosnik * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPOR): Set LIBS back to initial value. (GLIBCPP_EXPORT_INCLUDES): Only export TOPLEVEL_INCLUDES if building a canadian cross. This should fix the remaining java build issues. * aclocal.m4: Regenerate. * configure: Regenerate. * include/bits/c++config (__GLIBCPP__): Set release version for 2.91. From-SVN: r37469 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/acinclude.m4 | 6 ++++-- libstdc++-v3/aclocal.m4 | 6 ++++-- libstdc++-v3/configure | 6 ++++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c5296e488e2..0aecd4dcdde 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -2,7 +2,11 @@ * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPOR): Set LIBS back to initial value. + (GLIBCPP_EXPORT_INCLUDES): Only export TOPLEVEL_INCLUDES if + building a canadian cross. This should fix the remaining java + build issues. * aclocal.m4: Regenerate. + * configure: Regenerate. * include/bits/c++config (__GLIBCPP__): Set release version for 2.91. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index c037a39be7f..a7962e06490 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1546,8 +1546,10 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [ # variable is set to the include directory currently in use. # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW - # Passed down for cross compilers, canadian crosses. - TOPLEVEL_INCLUDES='-I$(includedir)' + # Passed down for canadian crosses. + if test x"$CANADIAN" = xyes; then + TOPLEVEL_INCLUDES='-I$(includedir)' + fi LIBMATH_INCLUDES='-I$(top_srcdir)/libmath' diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 05a02542e35..cfd7ae9e056 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1558,8 +1558,10 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [ # variable is set to the include directory currently in use. # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW - # Passed down for cross compilers, canadian crosses. - TOPLEVEL_INCLUDES='-I$(includedir)' + # Passed down for canadian crosses. + if test x"$CANADIAN" = xyes; then + TOPLEVEL_INCLUDES='-I$(includedir)' + fi LIBMATH_INCLUDES='-I$(top_srcdir)/libmath' diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 87c96cf1e41..65599cb67ec 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -18735,8 +18735,10 @@ fi # variable is set to the include directory currently in use. # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW - # Passed down for cross compilers, canadian crosses. - TOPLEVEL_INCLUDES='-I$(includedir)' + # Passed down for canadian crosses. + if test x"$CANADIAN" = xyes; then + TOPLEVEL_INCLUDES='-I$(includedir)' + fi LIBMATH_INCLUDES='-I$(top_srcdir)/libmath' -- 2.30.2