Skip to content

Commit 799edfa

Browse files
Don't link with crypto libs if USE_SSL isn't set.
1 parent f74b081 commit 799edfa

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

Makefile

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,19 @@ ifeq ($(TEST_ASYNC),1)
9191
export CFLAGS+=-DHIREDIS_TEST_ASYNC
9292
endif
9393

94-
ifeq ($(uname_S),Linux)
95-
ifdef OPENSSL_PREFIX
94+
ifeq ($(USE_SSL),1)
95+
ifeq ($(uname_S),Linux)
96+
ifdef OPENSSL_PREFIX
97+
CFLAGS+=-I$(OPENSSL_PREFIX)/include
98+
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
99+
else
100+
SSL_LDFLAGS=-lssl -lcrypto
101+
endif
102+
else
103+
OPENSSL_PREFIX?=/usr/local/opt/openssl
96104
CFLAGS+=-I$(OPENSSL_PREFIX)/include
97105
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
98-
else
99-
SSL_LDFLAGS=-lssl -lcrypto
100106
endif
101-
else
102-
OPENSSL_PREFIX?=/usr/local/opt/openssl
103-
CFLAGS+=-I$(OPENSSL_PREFIX)/include
104-
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
105107
endif
106108

107109
ifeq ($(uname_S),FreeBSD)
@@ -231,7 +233,10 @@ hiredis-example-push: examples/example-push.c $(STLIBNAME)
231233
examples: $(EXAMPLES)
232234

233235
TEST_LIBS = $(STLIBNAME) $(SSL_STLIB)
234-
TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
236+
TEST_LDFLAGS = $(SSL_LDFLAGS)
237+
ifeq ($(USE_SSL),1)
238+
TEST_LDFLAGS += -pthread
239+
endif
235240
ifeq ($(TEST_ASYNC),1)
236241
TEST_LDFLAGS += -levent
237242
endif

0 commit comments

Comments
 (0)