Skip to content

Commit f485eab

Browse files
sangbidarustyrussell
authored andcommitted
makefile: Change hardcoded homebrew paths
We're removing the hardcoded homebrew paths for openssl and sqlite as those folder paths may not be correct for all macOS users. Instead we are now calling brew --prefix to get the correct path and use that to populate the LDFLAGS and CPPFLAGS
1 parent 9d897b0 commit f485eab

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

Makefile

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,26 @@ man8dir = $(mandir)/man8
263263
ifeq ("$(OS)-$(ARCH)", "Darwin-arm64")
264264
CPATH := /opt/homebrew/include
265265
LIBRARY_PATH := /opt/homebrew/lib
266-
LDFLAGS := -L/opt/homebrew/opt/sqlite/lib -L/opt/homebrew/opt/openssl@3/lib
267-
CPPFLAGS := -I/opt/homebrew/opt/sqlite/include -I/opt/homebrew/opt/openssl@3/include
268-
PKG_CONFIG_PATH=/opt/homebrew/opt/sqlite/lib/pkgconfig
269266
else
270267
CPATH := /usr/local/include
271268
LIBRARY_PATH := /usr/local/lib
272269
endif
273270

271+
# Detect OpenSSL and SQLite paths dynamically using brew --prefix
272+
ifeq ("$(OS)", "Darwin")
273+
OPENSSL_PREFIX := $(shell brew --prefix openssl@3 2>/dev/null || brew --prefix openssl 2>/dev/null || echo "")
274+
SQLITE_PREFIX := $(shell brew --prefix sqlite 2>/dev/null || echo "")
275+
ifneq ("$(OPENSSL_PREFIX)", "")
276+
LDFLAGS += -L$(OPENSSL_PREFIX)/lib
277+
CPPFLAGS += -I$(OPENSSL_PREFIX)/include
278+
endif
279+
ifneq ("$(SQLITE_PREFIX)", "")
280+
LDFLAGS += -L$(SQLITE_PREFIX)/lib
281+
CPPFLAGS += -I$(SQLITE_PREFIX)/include
282+
PKG_CONFIG_PATH := $(SQLITE_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)
283+
endif
284+
endif
285+
274286
CPPFLAGS += -DCLN_NEXT_VERSION="\"$(CLN_NEXT_VERSION)\"" -DPKGLIBEXECDIR="\"$(pkglibexecdir)\"" -DBINDIR="\"$(bindir)\"" -DPLUGINDIR="\"$(plugindir)\"" -DCCAN_TAL_NEVER_RETURN_NULL=1
275287
CFLAGS = $(CPPFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(COPTFLAGS) -I $(CCANDIR) $(EXTERNAL_INCLUDE_FLAGS) -I . -I$(CPATH) $(SQLITE3_CFLAGS) $(SODIUM_CFLAGS) $(POSTGRES_INCLUDE) $(FEATURES) $(COVFLAGS) $(DEV_CFLAGS) -DSHACHAIN_BITS=48 -DJSMN_PARENT_LINKS $(PIE_CFLAGS) $(COMPAT_CFLAGS) $(CSANFLAGS)
276288

0 commit comments

Comments
 (0)