commit ae157b79e76695b8afe580da033789ba92b7ffdf parent 622a057e7e5d9f757d040283c7089d1fab847ae3 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 3 Aug 2018 07:33:45 -0400 Merge branch 'maint-0.3.4' Diffstat:
| A | changes/bug20424_029_minimal | | | 4 | ++++ |
| M | configure.ac | | | 4 | ++++ |
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal @@ -0,0 +1,4 @@ + 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. diff --git a/configure.ac b/configure.ac @@ -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.