Skip to content

Commit d1e562a

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 now includes git-compat-util.h and links against libgit.a. The osxkeychain Makefile has: CFLAGS ?= -g -O2 -Wall -I../../.. $(BASIC_CFLAGS) The -I../../.. is needed to find git-compat-util.h when building from contrib/credential/osxkeychain/. However, our config.mak sets CFLAGS explicitly, so the ?= conditional assignment is ignored and the include path is never added, causing: git-credential-osxkeychain.c:5:10: fatal error: 'git-compat-util.h' file not found See https://github.com/microsoft/git/actions/runs/21495314261 for the failing run. Fix this by adding a target-specific variable in config.mak that appends the required include path specifically for git-credential-osxkeychain.o. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
1 parent f0a9372 commit d1e562a

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
@@ -509,6 +509,11 @@ jobs:
509509
cat >>git/config.mak <<EOF
510510
CFLAGS = -I$homebrew_prefix/include -I/usr/local/opt/gettext/include
511511
LDFLAGS = -L"$(pwd)"
512+
513+
# The osxkeychain Makefile uses CFLAGS ?= with -I../../.. to find
514+
# git-compat-util.h, but since we set CFLAGS above, that default is
515+
# ignored. Use a target-specific variable to add the include path.
516+
git-credential-osxkeychain.o: CFLAGS += -I../../.. \$(BASIC_CFLAGS)
512517
EOF
513518
514519
# Configure the Git to use the OS supplied libcurl.

0 commit comments

Comments
 (0)