From 64b89453bce993860d16b1e610b38401a0462086 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 19 Sep 2012 22:57:53 +0000 Subject: [PATCH] configure.ac: Only use GCC_CHECK_UNWIND_GETIPINFO when compiled as a target library. * configure.ac: Only use GCC_CHECK_UNWIND_GETIPINFO when compiled as a target library. * configure: Rebuild. From-SVN: r191503 --- libbacktrace/ChangeLog | 6 ++++++ libbacktrace/configure | 15 +++++++++++++++ libbacktrace/configure.ac | 10 +++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index ea9ff2fa59f..e5baeb53506 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,9 @@ +2012-09-19 Ian Lance Taylor + + * configure.ac: Only use GCC_CHECK_UNWIND_GETIPINFO when compiled + as a target library. + * configure: Rebuild. + 2012-09-19 Rainer Orth Ian Lance Taylor diff --git a/libbacktrace/configure b/libbacktrace/configure index bbd5d1182d3..a57b51b2951 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -11734,6 +11734,7 @@ fi +if test -n "${with_target_subdir}"; then # Check whether --with-system-libunwind was given. @@ -11770,6 +11771,20 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h fi +else + ac_fn_c_check_func "$LINENO" "_Unwind_GetIPInfo" "ac_cv_func__Unwind_GetIPInfo" +if test "x$ac_cv_func__Unwind_GetIPInfo" = x""yes; then : + have_unwind_getipinfo=yes +else + have_unwind_getipinfo=no +fi + + if test "$have_unwind_getipinfo" = "yes"; then + +$as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h + + fi +fi # When building as a target library, shared libraries may want to link # this in. We don't want to provide another shared library to diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac index 4e0abbab720..b21beea11b0 100644 --- a/libbacktrace/configure.ac +++ b/libbacktrace/configure.ac @@ -98,7 +98,15 @@ fi AC_SUBST(WARN_FLAGS) -GCC_CHECK_UNWIND_GETIPINFO +if test -n "${with_target_subdir}"; then + GCC_CHECK_UNWIND_GETIPINFO +else + AC_CHECK_FUNC(_Unwind_GetIPInfo, [have_unwind_getipinfo=yes], + [have_unwind_getipinfo=no]) + if test "$have_unwind_getipinfo" = "yes"; then + AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.]) + fi +fi # When building as a target library, shared libraries may want to link # this in. We don't want to provide another shared library to