diff options
| author | David Carlier <devnexen@gmail.com> | 2018-11-11 18:49:55 +0000 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2018-11-22 11:21:47 +0100 |
| commit | e8b4291a0f5021a9befb9003e5a4da3a7b708647 (patch) | |
| tree | b4cee7857b105df419bf6f0ea42bbbf375bc2a16 | |
| parent | 8fcfd374d707e2c97c60ffb1ae31c6a62730e0ae (diff) | |
| download | redis-e8b4291a0f5021a9befb9003e5a4da3a7b708647.tar.gz | |
DragonFlyBSD little build fix
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/setproctitle.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 2d279775d..0de0a1c61 100644 --- a/src/Makefile +++ b/src/Makefile @@ -107,6 +107,10 @@ ifeq ($(uname_S),FreeBSD) # FreeBSD FINAL_LIBS+= -lpthread else +ifeq ($(uname_S),DragonFly) + # FreeBSD + FINAL_LIBS+= -lpthread +else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt @@ -115,6 +119,7 @@ endif endif endif endif +endif # Include paths to dependencies FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src diff --git a/src/setproctitle.c b/src/setproctitle.c index 6563242de..5f91d7bfe 100644 --- a/src/setproctitle.c +++ b/src/setproctitle.c @@ -39,7 +39,7 @@ #include <errno.h> /* errno program_invocation_name program_invocation_short_name */ #if !defined(HAVE_SETPROCTITLE) -#if (defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__) +#if (defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __DragonFly__) #define HAVE_SETPROCTITLE 1 #else #define HAVE_SETPROCTITLE 0 |