From 5b6d595bd778d9737f12c79118ce5cc9410f421b Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 22 Jul 2011 08:58:25 +0000 Subject: re PR bootstrap/49794 (Solaris 10/x86 bootstrap broken by C++ build) 2011-07-20 Rainer Orth Ralf Wildenhues 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 From-SVN: r176620 --- libcpp/configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libcpp/configure.ac') 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 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" -- cgit v1.1