Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
ada7aa7a
Commit
ada7aa7a
authored
Mar 16, 2013
by
Johan Bergström
Browse files
Spaces to tabs
parent
bea60bec
Changes
2
Hide whitespace changes
Inline
Side-by-side
deps/Makefile
View file @
ada7aa7a
...
@@ -54,8 +54,8 @@ linenoise: .make-prerequisites
...
@@ -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)
...
...
src/Makefile
View file @
ada7aa7a
...
@@ -24,22 +24,22 @@ OPT= $(OPTIMIZATION)
...
@@ -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
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment