On Thu, Jan 29, 2015 at 10:16 AM, H.J. Lu <hjl.to...@gmail.com> wrote:
> 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)
This is what I checked in.
--
H.J.
---
Index: ChangeLog
===================================================================
--- ChangeLog (revision 220257)
+++ ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2015-01-29 H.J. Lu <hongjiu...@intel.com>
+
+ * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
+ after vtv_cygmin is set.
+ * configure: Regenerated.
+
2015-01-29 Matthias Klose <d...@ubuntu.com>
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
Index: acinclude.m4
===================================================================
--- acinclude.m4 (revision 220257)
+++ acinclude.m4 (working copy)
@@ -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)
Index: configure
===================================================================
--- configure (revision 220257)
+++ configure (working copy)
@@ -17459,15 +17459,6 @@ $as_echo_n "checking for vtable verify s
{ $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
+
+
