diff options
| author | Johan Bergström <bugs@bergstroem.nu> | 2013-03-16 18:35:20 +1100 |
|---|---|---|
| committer | Johan Bergström <bugs@bergstroem.nu> | 2013-03-16 18:35:20 +1100 |
| commit | ada7aa7ac930a50e0f860c3028554a0c6c775cd2 (patch) | |
| tree | 731ef275a2fa4cde49cc5243d3a884319d743657 /src | |
| parent | bea60bec750a458d69c6f42c080d9ffa1daeea2b (diff) | |
| download | redis-ada7aa7ac930a50e0f860c3028554a0c6c775cd2.tar.gz | |
Spaces to tabs
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile index 0d5ddfe30..22facba47 100644 --- a/src/Makefile +++ b/src/Makefile @@ -24,22 +24,22 @@ OPT= $(OPTIMIZATION) # Default allocator ifeq ($(uname_S),Linux) - MALLOC=jemalloc + MALLOC=jemalloc else - MALLOC=libc + MALLOC=libc endif # Backwards compatibility for selecting an allocator ifeq ($(USE_TCMALLOC),yes) - MALLOC=tcmalloc + MALLOC=tcmalloc endif ifeq ($(USE_TCMALLOC_MINIMAL),yes) - MALLOC=tcmalloc_minimal + MALLOC=tcmalloc_minimal endif ifeq ($(USE_JEMALLOC),yes) - MALLOC=jemalloc + MALLOC=jemalloc endif # Override default settings if possible @@ -65,19 +65,19 @@ endif FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC - FINAL_LIBS+= -ltcmalloc + FINAL_CFLAGS+= -DUSE_TCMALLOC + FINAL_LIBS+= -ltcmalloc endif ifeq ($(MALLOC),tcmalloc_minimal) - FINAL_CFLAGS+= -DUSE_TCMALLOC - FINAL_LIBS+= -ltcmalloc_minimal + FINAL_CFLAGS+= -DUSE_TCMALLOC + FINAL_LIBS+= -ltcmalloc_minimal endif ifeq ($(MALLOC),jemalloc) - DEPENDENCY_TARGETS+= jemalloc - FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + DEPENDENCY_TARGETS+= jemalloc + FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include + FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl endif REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) |