diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-07-22 08:58:25 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-07-22 08:58:25 +0000 |
| commit | 5b6d595bd778d9737f12c79118ce5cc9410f421b (patch) | |
| tree | e86bdc7a288c779fda5bb7d285129adcd52003f3 /libcpp/configure.ac | |
| parent | 94017021b1c6372bd66c6aad2044a2a3d41f81f5 (diff) | |
| download | gcc-5b6d595bd778d9737f12c79118ce5cc9410f421b.zip gcc-5b6d595bd778d9737f12c79118ce5cc9410f421b.tar.gz gcc-5b6d595bd778d9737f12c79118ce5cc9410f421b.tar.bz2 | |
re PR bootstrap/49794 (Solaris 10/x86 bootstrap broken by C++ build)
2011-07-20 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
gcc:
PR bootstrap/49794
* configure.ac: Test AM_ICONV with CXX.
* configure: Regenerate.
* config/sol2-c.c (solaris_format_types): Use EXPORTED_CONST.
gcc/ada:
PR bootstrap/49794
* init.c [sun && __SVR4 && !__vxworks] (__gnat_install_handler):
Assign to act.sa_sigaction.
* tracebak.c [USE_GENERIC_UNWINDER] (__gnat_backtrace): Cast
current->return_address to char * before arithmetic.
libcpp:
PR bootstrap/49794
* configure.ac: Test AM_ICONV with CXX.
* configure: Regenerate.
* system.h (HAVE_DESIGNATED_INITIALIZERS): Never define for C++.
Co-Authored-By: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
From-SVN: r176620
Diffstat (limited to 'libcpp/configure.ac')
| -rw-r--r-- | libcpp/configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libcpp/configure.ac b/libcpp/configure.ac index ce8cae6..170932c 100644 --- a/libcpp/configure.ac +++ b/libcpp/configure.ac @@ -102,7 +102,13 @@ if test $ac_cv_type_uchar = yes; then [Define if <sys/types.h> defines \`uchar'.]) fi -AM_ICONV +# g++ on Solaris 10+ defines _XOPEN_SOURCE=600, which exposes a different +# iconv() prototype. +AS_IF([test "$ENABLE_BUILD_WITH_CXX" = "yes"], + [AC_LANG_PUSH([C++]) + AM_ICONV + AC_LANG_POP([C++])], + [AM_ICONV]) # More defines and substitutions. PACKAGE="$PACKAGE_TARNAME" |