From f4392940cd6ba4fce0dbae021a93e277ad20d71e Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Thu, 29 Jan 2015 18:21:33 +0000
Subject: [PATCH] Define VTV_CYGMIN after vtv_cygmin is set
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
after vtv_cygmin is set.
* configure: Regenerated.
From-SVN: r220258
---
libstdc++-v3/ChangeLog | 6 ++++++
libstdc++-v3/acinclude.m4 | 4 ++--
libstdc++-v3/configure | 18 +++++++++---------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b8e29e4f1392..6466444c8004 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-29 H.J. Lu <hongjiu.lu@intel.com>
+
+ * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
+ after vtv_cygmin is set.
+ * configure: Regenerated.
+
2015-01-29 Matthias Klose <doko@ubuntu.com>
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 20844220acae..02ca3f364790 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2320,8 +2320,6 @@ 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*)
@@ -2341,6 +2339,8 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
VTV_CXXLINKFLAGS=
fi
+ AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes)
+
AC_SUBST(VTV_CXXFLAGS)
AC_SUBST(VTV_PCH_CXXFLAGS)
AC_SUBST(VTV_CXXLINKFLAGS)
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9078ce4609ac..cbaaaff73a19 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17459,15 +17459,6 @@ $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*)
@@ -17487,6 +17478,15 @@ fi
VTV_CXXLINKFLAGS=
fi
+ if test $vtv_cygmin = yes; then
+ VTV_CYGMIN_TRUE=
+ VTV_CYGMIN_FALSE='#'
+else
+ VTV_CYGMIN_TRUE='#'
+ VTV_CYGMIN_FALSE=
+fi
+
+
--
GitLab