diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 19 | ||||
| -rw-r--r-- | libstdc++-v3/configure.ac | 6 |
3 files changed, 30 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0b51888fb21..a0991022d43 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-10-31 Steve Ellcey <sellcey@mips.com> + + * configure.ac: Add header checks for fenv.h and complex.h. + * configure: Regenerate. + 2013-10-31 Edward Smith-Rowland <3dw4rd@verizon.net> Implement C++14 digit separators. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index c436cb98636..4be21b10eb3 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -18677,6 +18677,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Check for fenv.h and complex.h before GLIBCXX_CHECK_C99_TR1 +# so that the check is done with the C compiler (not C++). +# Checking with C++ can break a canadian cross build if either +# file does not exist in C but does in C++. +for ac_header in fenv.h complex.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + # For C99 support to TR1. diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index dd13b011f97..22fc840f68b 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -195,6 +195,12 @@ GLIBCXX_CHECK_S_ISREG_OR_S_IFREG AC_CHECK_HEADERS(sys/uio.h) GLIBCXX_CHECK_WRITEV +# Check for fenv.h and complex.h before GLIBCXX_CHECK_C99_TR1 +# so that the check is done with the C compiler (not C++). +# Checking with C++ can break a canadian cross build if either +# file does not exist in C but does in C++. +AC_CHECK_HEADERS(fenv.h complex.h) + # For C99 support to TR1. GLIBCXX_CHECK_C99_TR1 |