Skip to content

Commit 5c9a81f

Browse files
committed
Disable pthread on Windows
1 parent 8d58ee3 commit 5c9a81f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

helper/helper.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ PYTHON_LIBS := \
3838
cinnabar/cmd/util.py \
3939
cinnabar/util.py
4040

41+
SYSTEM = $(shell python2.7 -c 'import platform; print platform.system()')
42+
4143
NO_GETTEXT ?= 1
4244
NO_OPENSSL ?= 1
45+
ifeq ($(SYSTEM),Windows)
46+
NO_PTHREADS ?= 1
47+
endif
4348

4449
include $(CURDIR)/Makefile
4550

46-
SYSTEM = $(shell python2.7 -c 'import platform; print platform.system()')
4751
ifeq ($(SYSTEM),Windows)
4852
CFLAGS += -DCURL_STATICLIB
4953
endif
@@ -133,6 +137,7 @@ EXCLUDE_OBJS += bitmap.o
133137
EXCLUDE_OBJS += blame.o
134138
EXCLUDE_OBJS += checkout.o
135139
EXCLUDE_OBJS += compat/mingw.o
140+
EXCLUDE_OBJS += compat/win32/pthread.o
136141
EXCLUDE_OBJS += connect.o
137142
EXCLUDE_OBJS += default.o
138143
EXCLUDE_OBJS += help.o

0 commit comments

Comments
 (0)