Skip to content

Commit 979e9dc

Browse files
committed
fixup! release: add Mac OSX installer build
Starting with upstream commit 4580bcd ("osxkeychain: avoid incorrectly skipping store operation", 2025-11-14), the osxkeychain credential helper includes git-compat-util.h. That header includes openssl/ssl.h unless -DNO_OPENSSL is defined: ../../../git-compat-util.h:199:10: fatal error: 'openssl/ssl.h' file not found On macOS, the main Makefile sets NO_OPENSSL (because Apple Common Crypto is used instead) and adds -DNO_OPENSSL to BASIC_CFLAGS. But contrib Makefiles that only include config.mak* files don't get this logic - they only see the variables, not the Makefile rules that convert NO_OPENSSL into -DNO_OPENSSL. Add -DNO_OPENSSL to BASIC_CFLAGS in config.mak so that contrib builds like osxkeychain can pick it up. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
1 parent 96a8306 commit 979e9dc

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/workflows/build-git-installers.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,11 @@ jobs:
491491
HOST_CPU = universal
492492
BASIC_CFLAGS += -arch arm64 -arch x86_64
493493
494+
# macOS uses Apple Common Crypto instead of OpenSSL. The main Makefile
495+
# sets NO_OPENSSL and adds -DNO_OPENSSL to BASIC_CFLAGS, but contrib
496+
# Makefiles that only include config.mak* don't get this logic.
497+
BASIC_CFLAGS += -DNO_OPENSSL
498+
494499
# CRITICAL FIX: Disable USE_HOMEBREW_LIBICONV
495500
# On Darwin 24+ (macOS 15), config.mak.uname sets USE_HOMEBREW_LIBICONV
496501
# which causes ICONVDIR to point to Homebrew's libiconv. But Homebrew's

0 commit comments

Comments
 (0)