summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2010-01-09 12:46:52 -0500
committerantirez <antirez@gmail.com>2010-01-09 12:46:52 -0500
commit92f8e882046e8e129236ac751d9a4fdf254b022f (patch)
tree4fb669f16d3cf5d0405e03c676ab7df568ee1fdb /Makefile
parentec6c7a1d78d4f42f78d5e006d7b1e804388088a1 (diff)
downloadredis-92f8e882046e8e129236ac751d9a4fdf254b022f.tar.gz
non-blocking VM data structures, just a start
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c036e10cd..50b328874 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,11 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
ifeq ($(uname_S),SunOS)
CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -D__EXTENSIONS__ -D_XPG6
CCLINK?= -ldl -lnsl -lsocket -lm
+ PTLINK?= -lpthread
else
CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
CCLINK?= -lm
+ PTLINK?= -lpthread
endif
CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
DEBUG?= -g -rdynamic -ggdb
@@ -40,7 +42,7 @@ sds.o: sds.c sds.h zmalloc.h
zmalloc.o: zmalloc.c config.h
redis-server: $(OBJ)
- $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
+ $(CC) -o $(PRGNAME) $(CCOPT) $(PTLINK) $(DEBUG) $(OBJ)
@echo ""
@echo "Hint: To run the test-redis.tcl script is a good idea."
@echo "Launch the redis server with ./redis-server, then in another"