summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in1
-rw-r--r--tests/check-namespace.sh.in4
2 files changed, 4 insertions, 1 deletions
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