diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-09 16:00:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 16:00:45 (GMT) |
| commit | c592023aed989c1fe98d6033c01b89d5b86dd8b4 (patch) | |
| tree | 1d18ab2f43de73d62dc8d41760bd66e53bb877b1 /Makefile | |
| parent | d02d7ac303b1a22c7de4a6c3a00074d38b498134 (diff) | |
| parent | c0f86547c522906da7538c0d2b7b0de608499c23 (diff) | |
| download | git-c592023aed989c1fe98d6033c01b89d5b86dd8b4.zip git-c592023aed989c1fe98d6033c01b89d5b86dd8b4.tar.gz git-c592023aed989c1fe98d6033c01b89d5b86dd8b4.tar.bz2 | |
Merge branch 'rj/platform-pread-may-be-thread-unsafe'
On Cygwin, the platform pread(3) is not thread safe, just like our
own compat/ emulation, and cannot be used in the index-pack program.
* rj/platform-pread-may-be-thread-unsafe:
index-pack: Disable threading on cygwin
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -158,6 +158,9 @@ all:: # Define NO_PREAD if you have a problem with pread() system call (e.g. # cygwin1.dll before v1.5.22). # +# Define NO_THREAD_SAFE_PREAD if your pread() implementation is not +# thread-safe. (e.g. compat/pread.c or cygwin) +# # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is # generally faster on your platform than accessing the working directory. # @@ -1059,6 +1062,7 @@ ifeq ($(uname_O),Cygwin) NO_IPV6 = YesPlease OLD_ICONV = UnfortunatelyYes endif + NO_THREAD_SAFE_PREAD = YesPlease NEEDS_LIBICONV = YesPlease NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes NO_TRUSTABLE_FILEMODE = UnfortunatelyYes @@ -1668,6 +1672,10 @@ endif ifdef NO_PREAD COMPAT_CFLAGS += -DNO_PREAD COMPAT_OBJS += compat/pread.o + NO_THREAD_SAFE_PREAD = YesPlease +endif +ifdef NO_THREAD_SAFE_PREAD + BASIC_CFLAGS += -DNO_THREAD_SAFE_PREAD endif ifdef NO_FAST_WORKING_DIRECTORY BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY |