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
49eef773
Commit
49eef773
authored
Mar 16, 2013
by
Johan Bergström
Committed by
antirez
Apr 02, 2013
Browse files
Spaces to tabs
parent
0c8690d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
deps/Makefile
View file @
49eef773
...
...
@@ -54,8 +54,8 @@ linenoise: .make-prerequisites
.PHONY
:
linenoise
ifeq
($(uname_S),SunOS)
# Make isinf() available
LUA_CFLAGS
=
-D__C99FEATURES__
=
1
# Make isinf() available
LUA_CFLAGS
=
-D__C99FEATURES__
=
1
endif
LUA_CFLAGS
+=
-O2
-Wall
-DLUA_ANSI
$(CFLAGS)
...
...
src/Makefile
View file @
49eef773
...
...
@@ -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)
...
...
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