Commit 42c6ebda authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

parents 6443812e 16bdbddc
o Minor bugfixes (compilation):
- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
the compiler not to include the system malloc implementation. Fixes bug
20424; bugfix on 0.2.0.20-rc.
......@@ -1438,6 +1438,10 @@ fi
if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
fi
if test "$using_custom_malloc" = "yes"; then
# Tell the C compiler not to use the system allocator functions.
TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc -fno-builtin-calloc -fno-builtin-free])
fi
# By default, we're going to assume we don't have mlockall()
# bionic and other platforms have various broken mlockall subsystems.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment