From ca6bd4f1c8081275f9bb98d351e5fb2b0b1fa135 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Tue, 2 Mar 2010 14:12:58 -0800 Subject: [PATCH] Add the --with-static-libunwind configure option. --- jemalloc/INSTALL | 4 ++++ jemalloc/configure.ac | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/jemalloc/INSTALL b/jemalloc/INSTALL index c02e2520..e8d0b7ab 100644 --- a/jemalloc/INSTALL +++ b/jemalloc/INSTALL @@ -59,6 +59,10 @@ any of the following arguments (not a definitive list) to 'configure': variety of system configurations than the default backtracing code, which is based on libgcc functionality or gcc intrinsics. +--with-static-libunwind= + Statically link against the specified libunwind.a rather than dynamically + linking with -lunwind. + --disable-tiny Disable tiny (sub-quantum-sized) object support. Technically it is not legal for a malloc implementation to allocate objects with less than diff --git a/jemalloc/configure.ac b/jemalloc/configure.ac index 4d2d66ad..b963e0e6 100644 --- a/jemalloc/configure.ac +++ b/jemalloc/configure.ac @@ -366,6 +366,19 @@ fi ], [enable_prof_libunwind="0"] ) +AC_ARG_WITH([static_libunwind], + [AS_HELP_STRING([--with-static-libunwind=], + [Path to static libunwind library; use rather than dynamically linking])], +if test "x$with_static_libunwind" = "xno" ; then + LUNWIND="-lunwind" +else + if test ! -f "$with_static_libunwind" ; then + AC_MSG_ERROR([Static libunwind not found: $with_static_libunwind]) + fi + LUNWIND="$with_static_libunwind" +fi, + LUNWIND="-lunwind" +) dnl Finish prof-related definitions below, once TLS configuration is done. dnl Enable tiny allocations by default. @@ -665,7 +678,7 @@ if test "x$enable_prof" = "x1" ; then AC_DEFINE([JEMALLOC_PROF], [ ]) if test "x$enable_prof_libunwind" = "x1" ; then AC_CHECK_HEADERS([libunwind.h], , [enable_prof_libunwind="0"]) - AC_CHECK_LIB([unwind], [backtrace], [LIBS="$LIBS -lunwind"], + AC_CHECK_LIB([unwind], [backtrace], [LIBS="$LIBS $LUNWIND"], [enable_prof_libunwind="0"]) if test "x${enable_prof_libunwind}" = "x1" ; then AC_DEFINE([JEMALLOC_PROF_LIBUNWIND], [ ])