diff options
| author | Benjamin Kosnik <bkoz@purist.soma.redhat.com> | 2000-11-14 21:05:05 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-11-14 21:05:05 +0000 |
| commit | 9f9359795c4ec1cec98ba86cf3bbacc35f28337f (patch) | |
| tree | 68b63d87531d9cf759db1fc39c49f3e149b920d4 | |
| parent | 2567bc56d35434e30198b7f644c055ab82fb1f6f (diff) | |
| download | gcc-9f9359795c4ec1cec98ba86cf3bbacc35f28337f.zip gcc-9f9359795c4ec1cec98ba86cf3bbacc35f28337f.tar.gz gcc-9f9359795c4ec1cec98ba86cf3bbacc35f28337f.tar.bz2 | |
acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPOR): Set LIBS back to initial value.
2000-11-14 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* 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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 6 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 6 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c5296e4..0aecd4d 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 c037a39..a7962e0 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 05a0254..cfd7ae9 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 87c96cf..65599cb 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' |