summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-04 23:34:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-04 23:34:45 (GMT)
commit921846fa22adb0abc3fb35e18c6be5feb5091cdd (patch)
tree4b53b3b120ff88bf1e1e93d7e36902d1aa5d8a8f /config.mak.uname
parent85c787f1e9476c3b8cbeeb4656973d0f1efd9881 (diff)
parentbbabaad29823890f328086c6f11b3dddc118adb8 (diff)
downloadgit-921846fa22adb0abc3fb35e18c6be5feb5091cdd.zip
git-921846fa22adb0abc3fb35e18c6be5feb5091cdd.tar.gz
git-921846fa22adb0abc3fb35e18c6be5feb5091cdd.tar.bz2
Merge branch 'jk/open-returns-eintr'
Work around platforms whose open() is reported to return EINTR (it shouldn't, as we do our signals with SA_RESTART). * jk/open-returns-eintr: config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur Makefile: add OPEN_RETURNS_EINTR knob
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index e22d4b6..d204c20 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