diff options
| author | Jason Evans <je@facebook.com> | 2010-03-02 22:12:58 (GMT) |
|---|---|---|
| committer | Jason Evans <je@facebook.com> | 2010-03-02 22:12:58 (GMT) |
| commit | ca6bd4f1c8081275f9bb98d351e5fb2b0b1fa135 (patch) | |
| tree | 02e6d7b54266d30437bb08e3f4571ba6f3e5aa7a /jemalloc | |
| parent | a40bc7afe8ae71b05eba81805c87d92e9bf6ce27 (diff) | |
| download | jemalloc-ca6bd4f1c8081275f9bb98d351e5fb2b0b1fa135.zip jemalloc-ca6bd4f1c8081275f9bb98d351e5fb2b0b1fa135.tar.gz jemalloc-ca6bd4f1c8081275f9bb98d351e5fb2b0b1fa135.tar.bz2 | |
Add the --with-static-libunwind configure option.
Diffstat (limited to 'jemalloc')
| -rw-r--r-- | jemalloc/INSTALL | 4 | ||||
| -rw-r--r-- | jemalloc/configure.ac | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/jemalloc/INSTALL b/jemalloc/INSTALL index c02e252..e8d0b7a 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=<libunwind.a> + 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 4d2d66a..b963e0e 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=<libunwind.a>], + [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], [ ]) |