diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-29 18:21:33 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-29 18:21:33 +0000 |
| commit | 8fb9737a2b8e99ea4edd77eedcdb7dc7253fabcf (patch) | |
| tree | 0c9236b5bec2029f2b7fdc9dec2ff1d70f8f88e3 | |
| parent | 5c7e9f4b13c02a72c386e411cc0642dda94b40c2 (diff) | |
| download | gcc-8fb9737a2b8e99ea4edd77eedcdb7dc7253fabcf.tar.gz | |
Define VTV_CYGMIN after vtv_cygmin is set
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
after vtv_cygmin is set.
* configure: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220258 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 18 |
3 files changed, 17 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b8e29e4f139..6466444c800 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 20844220aca..02ca3f36479 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 9078ce4609a..cbaaaff73a1 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 + + |