diff options
author | Jeff King <peff@peff.net> | 2021-03-01 04:29:47 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-01 09:07:45 -0800 |
commit | bbabaad29823890f328086c6f11b3dddc118adb8 (patch) | |
tree | 963581dd57dd54852078d1b3fdfa4288feb53cb1 | |
parent | Makefile: add OPEN_RETURNS_EINTR knob (diff) | |
download | tgif-bbabaad29823890f328086c6f11b3dddc118adb8.tar.xz |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | config.mak.uname | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 198ab1e58f..08933cba80 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -124,6 +124,9 @@ ifeq ($(uname_S),Darwin) ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1) HAVE_GETDELIM = YesPlease endif + ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 20 && echo 1),1) + OPEN_RETURNS_EINTR = UnfortunatelyYes + endif NO_MEMMEM = YesPlease USE_ST_TIMESPEC = YesPlease HAVE_DEV_TTY = YesPlease |