summaryrefslogtreecommitdiff
blob: 964ce71d5f78436cb05aa5f644f9a9af02baa129 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
https://github.com/antirez/redis/pull/218

diff --git a/src/Makefile b/src/Makefile
index 72edcad..3e43990 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,12 +35,14 @@ else
 endif
 
 ifeq ($(USE_TCMALLOC),yes)
+  USE_JEMALLOC=no
   ALLOC_DEP=
   ALLOC_LINK=-ltcmalloc
   ALLOC_FLAGS=-DUSE_TCMALLOC
 endif
 
 ifeq ($(USE_TCMALLOC_MINIMAL),yes)
+  USE_JEMALLOC=no
   ALLOC_DEP=
   ALLOC_LINK=-ltcmalloc_minimal
   ALLOC_FLAGS=-DUSE_TCMALLOC