diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2017-04-18 16:31:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 16:31:18 +0200 |
| commit | 27fe8e9fb2f4adf5337e74280215680e7cd59442 (patch) | |
| tree | b6248fb3cb43e5b85bebfe8fb20e6dee5f4a6ae6 | |
| parent | 02d02a3754d1af26a02504b95104e9f1227e681a (diff) | |
| parent | c4ad4765b03b303473b4a76f443bcca638aa1afd (diff) | |
| download | redis-27fe8e9fb2f4adf5337e74280215680e7cd59442.tar.gz | |
Merge pull request #3945 from badboy/dicthash-bench-compile
Reorder to make dict-benchmark compile on Linux
| -rw-r--r-- | src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index fec6573c2..8f429431b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 |