diff --git a/src/Makefile b/src/Makefile index f5525bd..6f12a20 100644 --- a/src/Makefile +++ b/src/Makefile @@ -29,14 +29,7 @@ INSTALL_BIN=$(PREFIX)/bin INSTALL=install # Default allocator defaults to Jemalloc if it's not an ARM -MALLOC=libc -ifneq ($(uname_M),armv6l) -ifneq ($(uname_M),armv7l) -ifeq ($(uname_S),Linux) - MALLOC=jemalloc -endif -endif -endif +MALLOC?=jemalloc # To get ARM stack traces if Redis crashes we need a special C flag. ifneq (,$(filter aarch64 armv,$(uname_M))) @@ -120,9 +113,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) endif ifeq ($(MALLOC),jemalloc) - DEPENDENCY_TARGETS+= jemalloc - FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include - FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) + FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE + FINAL_LIBS+= -ljemalloc -ldl endif REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)