Skip to content
Snippets Groups Projects
Commit ae157b79 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge branch 'maint-0.3.4'

parents 622a057e be8e56c2
No related branches found
No related tags found
No related merge requests found
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.
......@@ -1807,6 +1807,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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment