Remove rpath from linker flags; link artifacts statically
This commit is contained in:
parent
8f27c9684a
commit
4feec1f252
22
Makefile
22
Makefile
@ -10,7 +10,7 @@ OPTIMIZATION?=-O3
|
|||||||
ifeq ($(uname_S),SunOS)
|
ifeq ($(uname_S),SunOS)
|
||||||
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6 $(ARCH) $(PROF)
|
CFLAGS?=$(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,.
|
LDFLAGS?=-L.
|
||||||
DYLIBNAME?=libhiredis.so
|
DYLIBNAME?=libhiredis.so
|
||||||
DYLIB_MAKE_CMD?=$(CC) -G -o ${DYLIBNAME} ${OBJ}
|
DYLIB_MAKE_CMD?=$(CC) -G -o ${DYLIBNAME} ${OBJ}
|
||||||
STLIBNAME?=libhiredis.a
|
STLIBNAME?=libhiredis.a
|
||||||
@ -19,7 +19,7 @@ else
|
|||||||
ifeq ($(uname_S),Darwin)
|
ifeq ($(uname_S),Darwin)
|
||||||
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||||
CCLINK?=-lm -pthread
|
CCLINK?=-lm -pthread
|
||||||
LDFLAGS?=-L. -Wl,-rpath,.
|
LDFLAGS?=-L.
|
||||||
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}
|
||||||
@ -28,7 +28,7 @@ ifeq ($(uname_S),Darwin)
|
|||||||
else
|
else
|
||||||
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||||
CCLINK?=-lm -pthread
|
CCLINK?=-lm -pthread
|
||||||
LDFLAGS?=-L. -Wl,-rpath,.
|
LDFLAGS?=-L.
|
||||||
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
|
||||||
@ -64,23 +64,23 @@ dynamic: ${DYLIBNAME}
|
|||||||
static: ${STLIBNAME}
|
static: ${STLIBNAME}
|
||||||
|
|
||||||
# Binaries:
|
# Binaries:
|
||||||
hiredis-example-libevent: example-libevent.c adapters/libevent.h ${DYLIBNAME}
|
hiredis-example-libevent: example-libevent.c adapters/libevent.h $(STLIBNAME)
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis -levent example-libevent.c
|
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) $(STLIBNAME) example-libevent.c -levent
|
||||||
|
|
||||||
hiredis-example-libev: example-libev.c adapters/libev.h ${DYLIBNAME}
|
hiredis-example-libev: example-libev.c adapters/libev.h $(STLIBNAME)
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis -lev example-libev.c
|
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) $(STLIBNAME) example-libev.c -lev
|
||||||
|
|
||||||
ifndef AE_DIR
|
ifndef AE_DIR
|
||||||
hiredis-example-ae:
|
hiredis-example-ae:
|
||||||
@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
|
@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
|
||||||
@false
|
@false
|
||||||
else
|
else
|
||||||
hiredis-example-ae: example-ae.c adapters/ae.h ${DYLIBNAME}
|
hiredis-example-ae: example-ae.c adapters/ae.h $(STLIBNAME)
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) -I$(AE_DIR) $(LDFLAGS) -lhiredis example-ae.c $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o
|
$(CC) -o $@ $(CCOPT) $(DEBUG) -I$(AE_DIR) $(LDFLAGS) $(STLIBNAME) example-ae.c $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
hiredis-%: %.o ${DYLIBNAME}
|
hiredis-%: %.o $(STLIBNAME)
|
||||||
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis $<
|
$(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) $(STLIBNAME) $<
|
||||||
|
|
||||||
test: hiredis-test
|
test: hiredis-test
|
||||||
./hiredis-test
|
./hiredis-test
|
||||||
|
Loading…
Reference in New Issue
Block a user