Fix building shared library on Solaris
This commit is contained in:
parent
7e4ce57367
commit
be51c8398f
15
Makefile
15
Makefile
@ -8,15 +8,17 @@ BINS = hiredis-example hiredis-test
|
|||||||
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
||||||
OPTIMIZATION?=-O3
|
OPTIMIZATION?=-O3
|
||||||
ifeq ($(uname_S),SunOS)
|
ifeq ($(uname_S),SunOS)
|
||||||
CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6
|
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6 $(ARCH) $(PROF)
|
||||||
CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
|
CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
|
||||||
|
LDFLAGS?=-L. -Wl,-R,.
|
||||||
DYLIBNAME?=libhiredis.so
|
DYLIBNAME?=libhiredis.so
|
||||||
DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
|
DYLIB_MAKE_CMD?=$(CC) -G -o ${DYLIBNAME} ${OBJ}
|
||||||
STLIBNAME?=libhiredis.a
|
STLIBNAME?=libhiredis.a
|
||||||
STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
|
STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
|
||||||
else ifeq ($(uname_S),Darwin)
|
else ifeq ($(uname_S),Darwin)
|
||||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
|
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
|
||||||
CCLINK?=-lm -pthread
|
CCLINK?=-lm -pthread
|
||||||
|
LDFLAGS?=-Wl,-rpath,.
|
||||||
OBJARCH?=-arch i386 -arch x86_64
|
OBJARCH?=-arch i386 -arch x86_64
|
||||||
DYLIBNAME?=libhiredis.dylib
|
DYLIBNAME?=libhiredis.dylib
|
||||||
DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
|
DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
|
||||||
@ -25,6 +27,7 @@ else ifeq ($(uname_S),Darwin)
|
|||||||
else
|
else
|
||||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
|
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
|
||||||
CCLINK?=-lm -pthread
|
CCLINK?=-lm -pthread
|
||||||
|
LDFLAGS?=-Wl,-rpath,.
|
||||||
DYLIBNAME?=libhiredis.so
|
DYLIBNAME?=libhiredis.so
|
||||||
DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
|
DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
|
||||||
STLIBNAME?=libhiredis.a
|
STLIBNAME?=libhiredis.a
|
||||||
@ -59,10 +62,10 @@ static: ${STLIBNAME}
|
|||||||
|
|
||||||
# Binaries:
|
# Binaries:
|
||||||
hiredis-example-libevent: example-libevent.c adapters/libevent.h ${DYLIBNAME}
|
hiredis-example-libevent: example-libevent.c adapters/libevent.h ${DYLIBNAME}
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -levent -Wl,-rpath,. example-libevent.c
|
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis -levent example-libevent.c
|
||||||
|
|
||||||
hiredis-example-libev: example-libev.c adapters/libev.h ${DYLIBNAME}
|
hiredis-example-libev: example-libev.c adapters/libev.h ${DYLIBNAME}
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -lev -Wl,-rpath,. example-libev.c
|
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis -lev example-libev.c
|
||||||
|
|
||||||
ifndef AE_DIR
|
ifndef AE_DIR
|
||||||
hiredis-example-ae:
|
hiredis-example-ae:
|
||||||
@ -70,11 +73,11 @@ hiredis-example-ae:
|
|||||||
@false
|
@false
|
||||||
else
|
else
|
||||||
hiredis-example-ae: example-ae.c adapters/ae.h ${DYLIBNAME}
|
hiredis-example-ae: example-ae.c adapters/ae.h ${DYLIBNAME}
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) -I$(AE_DIR) -L. -lhiredis -Wl,-rpath,. example-ae.c $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o
|
$(CC) -o $@ $(CCOPT) $(DEBUG) -I$(AE_DIR) $(LDFLAGS) -lhiredis example-ae.c $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
hiredis-%: %.o ${DYLIBNAME}
|
hiredis-%: %.o ${DYLIBNAME}
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -Wl,-rpath,. $<
|
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis $<
|
||||||
|
|
||||||
test: hiredis-test
|
test: hiredis-test
|
||||||
./hiredis-test
|
./hiredis-test
|
||||||
|
Loading…
Reference in New Issue
Block a user