On Thu, Jan 29, 2015 at 10:13 AM, H.J. Lu <hjl.to...@gmail.com> wrote: > On Thu, Jan 29, 2015 at 10:11 AM, Jonathan Wakely <jwak...@redhat.com> wrote: >> On 29/01/15 19:05 +0100, Matthias Klose 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. >> >> >> OK, thanks. >> > > It is NOT OK. >
This patch checks vtv_cygmin after it is defined. I will check it in as an obvious fix after testing. -- H.J. --- diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 59df22d..02ca3f3 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2331,7 +2331,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 @@ -2340,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)