From 23842e91352595d851d6b75fcbc5d3bd7ead4e98 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 29 Jan 2015 18:12:29 +0000 Subject: [PATCH] acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN unconditionally. 2015-01-29 Matthias Klose * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN unconditionally. * configure: Regenerate. From-SVN: r220257 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/acinclude.m4 | 3 ++- libstdc++-v3/configure | 17 +++++++++-------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c26a48ea5f3..b8e29e4f139 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-01-29 Matthias Klose + + * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN + unconditionally. + * configure: Regenerate. + 2015-01-29 Caroline Tice Committing VTV Cywin/Ming patch for Patrick Wollgast diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 59df22d8703..20844220aca 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2320,6 +2320,8 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [ AC_MSG_CHECKING([for vtable verify support]) AC_MSG_RESULT([$enable_vtable_verify]) + AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes) + if test $enable_vtable_verify = yes; then case ${target_os} in cygwin*|mingw32*) @@ -2331,7 +2333,6 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [ vtv_cygmin="no" ;; esac - AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes) VTV_PCH_CXXFLAGS="-fvtable-verify=std" VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" else diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 07e7773ef48..9078ce4609a 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17459,6 +17459,15 @@ $as_echo_n "checking for vtable verify support... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtable_verify" >&5 $as_echo "$enable_vtable_verify" >&6; } + if test $vtv_cygmin = yes; then + VTV_CYGMIN_TRUE= + VTV_CYGMIN_FALSE='#' +else + VTV_CYGMIN_TRUE='#' + VTV_CYGMIN_FALSE= +fi + + if test $enable_vtable_verify = yes; then case ${target_os} in cygwin*|mingw32*) @@ -17470,14 +17479,6 @@ $as_echo "$enable_vtable_verify" >&6; } vtv_cygmin="no" ;; esac - if test $vtv_cygmin = yes; then - VTV_CYGMIN_TRUE= - VTV_CYGMIN_FALSE='#' -else - VTV_CYGMIN_TRUE='#' - VTV_CYGMIN_FALSE= -fi - VTV_PCH_CXXFLAGS="-fvtable-verify=std" VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" else -- 2.30.2