Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
27fe8e9f
Commit
27fe8e9f
authored
Apr 18, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 18, 2017
Browse files
Merge pull request #3945 from badboy/dicthash-bench-compile
Reorder to make dict-benchmark compile on Linux
parents
02d02a37
c4ad4765
Changes
1
Show whitespace changes
Inline
Side-by-side
src/Makefile
View file @
27fe8e9f
...
...
@@ -214,8 +214,8 @@ $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
$(REDIS_CHECK_AOF_NAME)
:
$(REDIS_CHECK_AOF_OBJ)
$(REDIS_LD)
-o
$@
$^
$(FINAL_LIBS)
dict-benchmark
:
dict.c zmalloc.c sds.c
$(REDIS_CC)
$(FINAL_CFLAGS)
dict.c zmalloc.c sds.c siphash.c
-D
DICT_BENCHMARK_MAIN
-o
dict-benchmark
dict-benchmark
:
dict.c zmalloc.c sds.c
siphash.c
$(REDIS_CC)
$(FINAL_CFLAGS)
$^
-D
DICT_BENCHMARK_MAIN
-o
$@
$(FINAL_LIBS)
# Because the jemalloc.h header is generated as a part of the jemalloc build,
# building it should complete before building any other object. Instead of
...
...
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