First set defaults, then do composition
This commit is contained in:
parent
15fd1bc04a
commit
f742e4a9ba
31
src/Makefile
31
src/Makefile
@ -17,25 +17,11 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|||||||
OPTIMIZATION?=-O2
|
OPTIMIZATION?=-O2
|
||||||
DEPENDENCY_TARGETS=hiredis linenoise lua
|
DEPENDENCY_TARGETS=hiredis linenoise lua
|
||||||
|
|
||||||
|
# Default settings
|
||||||
STD= -std=c99 -pedantic
|
STD= -std=c99 -pedantic
|
||||||
WARN= -Wall
|
WARN= -Wall
|
||||||
OPT= $(OPTIMIZATION)
|
OPT= $(OPTIMIZATION)
|
||||||
|
|
||||||
ifeq ($(uname_S),SunOS)
|
|
||||||
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6
|
|
||||||
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
|
|
||||||
FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread
|
|
||||||
DEBUG= -g -ggdb
|
|
||||||
else
|
|
||||||
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
|
|
||||||
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
|
|
||||||
FINAL_LIBS= $(LIBS) -lm -pthread
|
|
||||||
DEBUG= -g -rdynamic -ggdb
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Include paths to dependencies
|
|
||||||
FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
|
|
||||||
|
|
||||||
# Default allocator
|
# Default allocator
|
||||||
ifeq ($(uname_S),Linux)
|
ifeq ($(uname_S),Linux)
|
||||||
MALLOC=jemalloc
|
MALLOC=jemalloc
|
||||||
@ -56,6 +42,21 @@ ifeq ($(USE_JEMALLOC),yes)
|
|||||||
MALLOC=jemalloc
|
MALLOC=jemalloc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(uname_S),SunOS)
|
||||||
|
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6
|
||||||
|
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
|
||||||
|
FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread
|
||||||
|
DEBUG= -g -ggdb
|
||||||
|
else
|
||||||
|
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
|
||||||
|
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
|
||||||
|
FINAL_LIBS= $(LIBS) -lm -pthread
|
||||||
|
DEBUG= -g -rdynamic -ggdb
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Include paths to dependencies
|
||||||
|
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user