From dc91aca7b0a793a4d3ea17f9ae31c541ca83099b Mon Sep 17 00:00:00 2001 From: Yossi Gottlieb Date: Sun, 8 Aug 2021 18:30:17 +0300 Subject: [PATCH] Propagate OPENSSL_PREFIX to hiredis. (#9345) --- src/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index cf3e8c031..830e80a44 100644 --- a/src/Makefile +++ b/src/Makefile @@ -121,13 +121,15 @@ ifeq ($(uname_S),Darwin) # must be referenced explicitly during build. ifeq ($(uname_M),arm64) # Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX - OPENSSL_CFLAGS=-I/opt/homebrew/opt/openssl/include - OPENSSL_LDFLAGS=-L/opt/homebrew/opt/openssl/lib + OPENSSL_PREFIX=/opt/homebrew/opt/openssl else # Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX - OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include - OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib + OPENSSL_PREFIX=/usr/local/opt/openssl endif +OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include +OPENSSL_LDFLAGS=-L$(OPENSSL_PREFIX)/lib +# Also export OPENSSL_PREFIX so it ends up in deps sub-Makefiles +export OPENSSL_PREFIX else ifeq ($(uname_S),AIX) # AIX