From 19b8946dbda5fda4389ef8e3ea162c3df2b1998d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 31 Jan 2022 11:00:18 +0000 Subject: [PATCH] libstdc++: Improve config output for --enable-cstdio [PR104301] Currently we just print "checking for underlying I/O to use... stdio" unconditionally, whether configured to use stdio_pure or stdio_posix. We should make it clear that the user's configure option chose the right thing. libstdc++-v3/ChangeLog: PR libstdc++/104301 * acinclude.m4 (GLIBCXX_ENABLE_CSTDIO): Print different messages for stdio_pure and stdio_posix options. * configure: Regenerate. --- libstdc++-v3/acinclude.m4 | 4 +++- libstdc++-v3/configure | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 32638e6..066453e 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2830,11 +2830,13 @@ AC_DEFUN([GLIBCXX_ENABLE_CSTDIO], [ CSTDIO_H=config/io/c_io_stdio.h BASIC_FILE_H=config/io/basic_file_stdio.h BASIC_FILE_CC=config/io/basic_file_stdio.cc - AC_MSG_RESULT(stdio) if test "x$enable_cstdio" = "xstdio_pure" ; then + AC_MSG_RESULT([stdio (without POSIX read/write)]) AC_DEFINE(_GLIBCXX_USE_STDIO_PURE, 1, [Define to restrict std::__basic_file<> to stdio APIs.]) + else + AC_MSG_RESULT([stdio (with POSIX read/write)]) fi ;; esac diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index de6eb1c..ed64b55 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -16408,13 +16408,16 @@ fi CSTDIO_H=config/io/c_io_stdio.h BASIC_FILE_H=config/io/basic_file_stdio.h BASIC_FILE_CC=config/io/basic_file_stdio.cc - { $as_echo "$as_me:${as_lineno-$LINENO}: result: stdio" >&5 -$as_echo "stdio" >&6; } if test "x$enable_cstdio" = "xstdio_pure" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: stdio (without POSIX read/write)" >&5 +$as_echo "stdio (without POSIX read/write)" >&6; } $as_echo "#define _GLIBCXX_USE_STDIO_PURE 1" >>confdefs.h + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: stdio (with POSIX read/write)" >&5 +$as_echo "stdio (with POSIX read/write)" >&6; } fi ;; esac -- 2.7.4