diff options
| author | Caroline Tice <cmtice@google.com> | 2013-09-25 11:44:48 -0700 |
|---|---|---|
| committer | Caroline Tice <ctice@gcc.gnu.org> | 2013-09-25 11:44:48 -0700 |
| commit | 56fc78353ed96ccf2a347f4215795f86cce22cf9 (patch) | |
| tree | 4db3ab3f6f7cc4765540042bbc86f8d60a2ede5c /libvtv/configure.ac | |
| parent | 20f114a35a535d215d4df50480547de0790e392d (diff) | |
| download | gcc-56fc78353ed96ccf2a347f4215795f86cce22cf9.zip gcc-56fc78353ed96ccf2a347f4215795f86cce22cf9.tar.gz gcc-56fc78353ed96ccf2a347f4215795f86cce22cf9.tar.bz2 | |
Fix issue with libvtv testsuite being run (and failing)
when GCC was not configured with --enable-vtable-verify.
From-SVN: r202918
Diffstat (limited to 'libvtv/configure.ac')
| -rw-r--r-- | libvtv/configure.ac | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/libvtv/configure.ac b/libvtv/configure.ac index e3fb92f..12b4664 100644 --- a/libvtv/configure.ac +++ b/libvtv/configure.ac @@ -27,6 +27,18 @@ target_alias=${target_alias-$host_alias} AC_SUBST(target_alias) GCC_LIBSTDCXX_RAW_CXX_FLAGS +# Use same top-level configure hooks in libgcc/libstdc++/libvtv. +AC_MSG_CHECKING([for --enable-vtable-verify]) +AC_ARG_ENABLE(vtable-verify, +[ --enable-vtable-verify Enable vtable verification feature ], +[case "$enableval" in + yes) enable_vtable_verify=yes ;; + no) enable_vtable_verify=no ;; + *) enable_vtable_verify=no;; + esac], +[enable_vtable_verify=no]) +AC_MSG_RESULT($enable_vtable_verify) + # See if supported. unset VTV_SUPPORTED AC_MSG_CHECKING([for host support for vtable verification]) @@ -36,9 +48,12 @@ AC_MSG_RESULT($VTV_SUPPORTED) # Decide if it's usable. use_vtable_verify=no if test "x$VTV_SUPPORTED" = "xyes"; then - use_vtable_verify=yes - AC_MSG_NOTICE(using vtable verification) + if test "x$enable_vtable_verify" = "xyes"; then + use_vtable_verify=yes + AC_MSG_NOTICE(using vtable verification) + fi fi +AM_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $use_vtable_verify = yes) AM_INIT_AUTOMAKE(foreign no-dist) AM_ENABLE_MULTILIB(, ..) @@ -126,7 +141,7 @@ fi AC_CONFIG_FILES([Makefile]) if test "x$VTV_SUPPORTED" = "xyes"; then - AC_CONFIG_FILES(AC_FOREACH([DIR], [. testsuite], [DIR/Makefile ]), + AC_CONFIG_FILES(AC_FOREACH([DIR], [testsuite], [DIR/Makefile ]), [cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF |