From 83cef8b8f51eb46b23f6e72493d070c95a544919 Mon Sep 17 00:00:00 2001
From: Arun Sharma <aruns@google.com>
Date: Sun, 15 Mar 2009 20:01:23 -0700
Subject: [PATCH] Don't check C++ ABI when it's not enabled.

---
 configure.in                | 1 +
 tests/check-namespace.sh.in | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 789613d7..17ef42f8 100644
--- a/configure.in
+++ b/configure.in
@@ -168,6 +168,7 @@ AC_SUBST(PKG_MAJOR)
 AC_SUBST(PKG_MINOR)
 AC_SUBST(PKG_EXTRA)
 AC_SUBST(PKG_MAINTAINER)
+AC_SUBST(enable_cxx_exceptions)
 
 AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
 		doc/Makefile doc/common.tex include/libunwind-common.h)
diff --git a/tests/check-namespace.sh.in b/tests/check-namespace.sh.in
index b7285b1d..b8218813 100644
--- a/tests/check-namespace.sh.in
+++ b/tests/check-namespace.sh.in
@@ -242,7 +242,9 @@ if [ $plat = $build_plat ]; then
     fetch_symtab $LIBUNWIND
     filter_misc
     check_local_unw_abi
-    check_cxx_abi
+    if [ x@enable_cxx_exceptions@ = yes ]; then
+      check_cxx_abi
+    fi
     check_empty
 fi