gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spaces to tabs

Browse Source
This commit is contained in:
Johan Bergström 2013-03-16 18:35:20 +11:00
parent ec31f87ad8
commit 1fe70ba598
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/Makefile vendored
View File

@ -54,8 +54,8 @@ linenoise: .make-prerequisites
.PHONY: linenoise .PHONY: linenoise
ifeq ($(uname_S),SunOS) ifeq ($(uname_S),SunOS)
# Make isinf() available # Make isinf() available
LUA_CFLAGS= -D__C99FEATURES__=1 LUA_CFLAGS= -D__C99FEATURES__=1
endif endif
LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)

24
src/Makefile
View File

@ -24,22 +24,22 @@ OPT= $(OPTIMIZATION)
# Default allocator # Default allocator
ifeq ($(uname_S),Linux) ifeq ($(uname_S),Linux)
MALLOC=jemalloc MALLOC=jemalloc
else else
MALLOC=libc MALLOC=libc
endif endif
# Backwards compatibility for selecting an allocator # Backwards compatibility for selecting an allocator
ifeq ($(USE_TCMALLOC),yes) ifeq ($(USE_TCMALLOC),yes)
MALLOC=tcmalloc MALLOC=tcmalloc
endif endif
ifeq ($(USE_TCMALLOC_MINIMAL),yes) ifeq ($(USE_TCMALLOC_MINIMAL),yes)
MALLOC=tcmalloc_minimal MALLOC=tcmalloc_minimal
endif endif
ifeq ($(USE_JEMALLOC),yes) ifeq ($(USE_JEMALLOC),yes)
MALLOC=jemalloc MALLOC=jemalloc
endif endif
# Override default settings if possible # Override default settings if possible
@ -65,19 +65,19 @@ endif
FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
ifeq ($(MALLOC),tcmalloc) ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC FINAL_CFLAGS+= -DUSE_TCMALLOC
FINAL_LIBS+= -ltcmalloc FINAL_LIBS+= -ltcmalloc
endif endif
ifeq ($(MALLOC),tcmalloc_minimal) ifeq ($(MALLOC),tcmalloc_minimal)
FINAL_CFLAGS+= -DUSE_TCMALLOC FINAL_CFLAGS+= -DUSE_TCMALLOC
FINAL_LIBS+= -ltcmalloc_minimal FINAL_LIBS+= -ltcmalloc_minimal
endif endif
ifeq ($(MALLOC),jemalloc) ifeq ($(MALLOC),jemalloc)
DEPENDENCY_TARGETS+= jemalloc DEPENDENCY_TARGETS+= jemalloc
FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
endif endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)