Skip to content

Commit bbabaad

Browse files
peffgitster
authored andcommitted
config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
We've had mixed reports on whether the latest release of macOS needs this Makefile knob set. In most reported cases, there's antivirus software running (which one might imagine could cause an open() call to be delayed). However, one of the (off-list) reports I've gotten indicated that it happened on an otherwise clean install of Big Sur. Since the symptom is so bad (checkout randomly fails to write several fails when the progress meter kicks in), and since the workaround is so lightweight (if we don't see EINTR, it's just an extra conditional check), let's just turn it on by default. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2b08101 commit bbabaad

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

config.mak.uname

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ ifeq ($(uname_S),Darwin)
124124
ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1)
125125
HAVE_GETDELIM = YesPlease
126126
endif
127+
ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 20 && echo 1),1)
128+
OPEN_RETURNS_EINTR = UnfortunatelyYes
129+
endif
127130
NO_MEMMEM = YesPlease
128131
USE_ST_TIMESPEC = YesPlease
129132
HAVE_DEV_TTY = YesPlease

0 commit comments

Comments
 (0)