summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-03-04 15:34:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-04 15:34:45 -0800
commit921846fa22adb0abc3fb35e18c6be5feb5091cdd (patch)
tree4b53b3b120ff88bf1e1e93d7e36902d1aa5d8a8f /Makefile
parentMerge https://github.com/prati0100/git-gui (diff)
parentconfig.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur (diff)
downloadtgif-921846fa22adb0abc3fb35e18c6be5feb5091cdd.tar.xz
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 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index dd08b4ced0..dfb0f1000f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@ all::
# when attempting to read from an fopen'ed directory (or even to fopen
# it at all).
#
+# Define OPEN_RETURNS_EINTR if your open() system call may return EINTR
+# when a signal is received (as opposed to restarting).
+#
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
#
# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1539,6 +1542,10 @@ ifdef FREAD_READS_DIRECTORIES
COMPAT_CFLAGS += -DFREAD_READS_DIRECTORIES
COMPAT_OBJS += compat/fopen.o
endif
+ifdef OPEN_RETURNS_EINTR
+ COMPAT_CFLAGS += -DOPEN_RETURNS_EINTR
+ COMPAT_OBJS += compat/open.o
+endif
ifdef NO_SYMLINK_HEAD
BASIC_CFLAGS += -DNO_SYMLINK_HEAD
endif