Commit 8b6ecf8
committed
osxkeychain: always apply required build flags
Starting with upstream commit 4580bcd ("osxkeychain: avoid
incorrectly skipping store operation", 2025-11-14), the osxkeychain
credential helper includes git-compat-util.h and links against
libgit.a.
The osxkeychain Makefile has:
CFLAGS ?= -g -O2 -Wall -I../../.. $(BASIC_CFLAGS)
The ?= operator means "set only if not already set". When building
via a parent Makefile that passes CFLAGS on the command line, this
entire assignment is ignored - including the -I../../.. needed to find
git-compat-util.h and the $(BASIC_CFLAGS) needed for -DNO_OPENSSL:
git-credential-osxkeychain.c:5:10: fatal error:
'git-compat-util.h' file not found
Using += instead of ?= is not sufficient either, because command-line
variables in Make override even += assignments. We need to use
"override CFLAGS +=" to force these flags to be appended regardless
of how CFLAGS was set.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>1 parent 1e62bbc commit 8b6ecf8
1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
| 44 | + | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
0 commit comments