diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-25 11:40:37 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-25 15:07:29 +0000 |
| commit | 7b648e8313fdad9b782986eabf0c25253e6ff37e (patch) | |
| tree | 40c2741a0efb19b3f2bcbb3d083fdd53e0472d16 | |
| parent | f54ceb2062c7fef294f85ae093914fa6c7ca35b8 (diff) | |
| download | gcc-7b648e8313fdad9b782986eabf0c25253e6ff37e.zip gcc-7b648e8313fdad9b782986eabf0c25253e6ff37e.tar.gz gcc-7b648e8313fdad9b782986eabf0c25253e6ff37e.tar.bz2 | |
libstdc++: Fix orphaned/nested output of configure checks
This moves two AC_MSG_RESULT lines for <uchar.h> features so that they
are only printed when the corresponding AC_MSG_CHECKING actually
happened. This fixes configure output like:
checking for uchar.h... no
no
checking for int64_t... yes
Also move the AC_MSG_CHECKING for libbacktrace support so it doesn't
come after AC_CHECK_HEADERS output. This fixes:
checking whether to build libbacktrace support... checking for sys/mman.h... (cached) yes
yes
libstdc++-v3/ChangeLog:
* acinclude.m4 (GLIBCXX_CHECK_UCHAR_H): Don't use AC_MSG_RESULT
unless the AC_MSG_CHECKING happened.
* configure: Regenerate.
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 6 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index baf0191..b957c72 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2060,10 +2060,10 @@ AC_DEFUN([GLIBCXX_CHECK_UCHAR_H], [ ], [], [ac_uchar_c8rtomb_mbrtoc8_fchar8_t=yes], [ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no]) + AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_fchar8_t) else ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no fi - AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_fchar8_t) if test x"$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" = x"yes"; then AC_DEFINE(_GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_FCHAR8_T, 1, [Define if c8rtomb and mbrtoc8 functions in <uchar.h> should be @@ -2082,10 +2082,10 @@ AC_DEFUN([GLIBCXX_CHECK_UCHAR_H], [ ], [], [ac_uchar_c8rtomb_mbrtoc8_cxx20=yes], [ac_uchar_c8rtomb_mbrtoc8_cxx20=no]) + AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_cxx20) else ac_uchar_c8rtomb_mbrtoc8_cxx20=no fi - AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_cxx20) if test x"$ac_uchar_c8rtomb_mbrtoc8_cxx20" = x"yes"; then AC_DEFINE(_GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_CXX20, 1, [Define if c8rtomb and mbrtoc8 functions in <uchar.h> should be @@ -5045,6 +5045,7 @@ BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" if test "$enable_libstdcxx_backtrace" = "auto"; then enable_libstdcxx_backtrace=no fi + AC_MSG_RESULT($enable_libstdcxx_backtrace) if test "$enable_libstdcxx_backtrace" = "yes"; then BACKTRACE_SUPPORTED=1 @@ -5091,7 +5092,6 @@ BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" BACKTRACE_USES_MALLOC=0 BACKTRACE_SUPPORTS_THREADS=0 fi - AC_MSG_RESULT($enable_libstdcxx_backtrace) GLIBCXX_CONDITIONAL(ENABLE_BACKTRACE, [test "$enable_libstdcxx_backtrace" = yes]) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 31ccff5..1f7017c 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -19215,11 +19215,11 @@ else ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&5 +$as_echo "$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&6; } else ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&5 -$as_echo "$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&6; } if test x"$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" = x"yes"; then $as_echo "#define _GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_FCHAR8_T 1" >>confdefs.h @@ -19253,11 +19253,11 @@ else ac_uchar_c8rtomb_mbrtoc8_cxx20=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_cxx20" >&5 +$as_echo "$ac_uchar_c8rtomb_mbrtoc8_cxx20" >&6; } else ac_uchar_c8rtomb_mbrtoc8_cxx20=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_cxx20" >&5 -$as_echo "$ac_uchar_c8rtomb_mbrtoc8_cxx20" >&6; } if test x"$ac_uchar_c8rtomb_mbrtoc8_cxx20" = x"yes"; then $as_echo "#define _GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_CXX20 1" >>confdefs.h @@ -71212,6 +71212,8 @@ $as_echo_n "checking whether to build libbacktrace support... " >&6; } if test "$enable_libstdcxx_backtrace" = "auto"; then enable_libstdcxx_backtrace=no fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libstdcxx_backtrace" >&5 +$as_echo "$enable_libstdcxx_backtrace" >&6; } if test "$enable_libstdcxx_backtrace" = "yes"; then BACKTRACE_SUPPORTED=1 @@ -71280,8 +71282,6 @@ $as_echo "#define HAVE_STACKTRACE 1" >>confdefs.h BACKTRACE_USES_MALLOC=0 BACKTRACE_SUPPORTS_THREADS=0 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libstdcxx_backtrace" >&5 -$as_echo "$enable_libstdcxx_backtrace" >&6; } |