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
This commit is contained in:
parent
23842e9135
commit
f4392940cd
@ -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
|
||||
|
@ -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)
|
||||
|
18
libstdc++-v3/configure
vendored
18
libstdc++-v3/configure
vendored
@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user