diff options
author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-14 21:05:05 +0000 |
---|---|---|
committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-14 21:05:05 +0000 |
commit | b45d00ae33c6993f657cf1ec730e98ee0c6361e3 (patch) | |
tree | 68b63d87531d9cf759db1fc39c49f3e149b920d4 /libstdc++-v3/aclocal.m4 | |
parent | 4d964ff79cfe53091e58845d1e2fa803e73b67ad (diff) | |
download | gcc-b45d00ae33c6993f657cf1ec730e98ee0c6361e3.tar.gz |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37469 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
-rw-r--r-- | libstdc++-v3/aclocal.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
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' |