On Thu, Jan 29, 2015 at 10:12:38AM -0800, H.J. Lu wrote:
> On Thu, Jan 29, 2015 at 10:05 AM, Matthias Klose <d...@ubuntu.com> wrote:
> > that fixes the build failure. ok to commit?
> >
> > 2015-01-29 Matthias Klose <d...@ubuntu.com>
> >
> > * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
> > unconditionally.
> > * configure: Regenerate.
> >
>
> This is wrong. You are checking vtv_cygmin before it is defined.
Yeah, I'd say we need something like:
2015-01-29 Jakub Jelinek <ja...@redhat.com>
* acinclude.m4 (VTV_CYGMIN): Move AM_CONDITIONAL after vtv_cygmin
definition. Set vtv_cygmin to no even if $enable_vtable_verify
is not yet.
* configure: Regenerated.
--- libstdc++-v3/acinclude.m4 2015-01-29 19:19:19.305782787 +0100
+++ libstdc++-v3/acinclude.m4 2015-01-29 19:21:13.244854829 +0100
@@ -2320,17 +2320,15 @@ 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)
-
+ vtv_cygmin=no
if test $enable_vtable_verify = yes; then
case ${target_os} in
cygwin*|mingw32*)
VTV_CXXFLAGS="-fvtable-verify=std
-Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
- vtv_cygmin="yes"
+ vtv_cygmin=yes
;;
*)
VTV_CXXFLAGS="-fvtable-verify=std
-Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
- vtv_cygmin="no"
;;
esac
VTV_PCH_CXXFLAGS="-fvtable-verify=std"
@@ -2344,6 +2342,7 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY],
AC_SUBST(VTV_CXXFLAGS)
AC_SUBST(VTV_PCH_CXXFLAGS)
AC_SUBST(VTV_CXXLINKFLAGS)
+ AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes)
GLIBCXX_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $enable_vtable_verify = yes)
])
Jakub
