Skip to content

Commit

Permalink
Disable pthread on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Jul 18, 2020
1 parent 8d58ee3 commit 5c9a81f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion helper/helper.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,16 @@ PYTHON_LIBS := \
cinnabar/cmd/util.py \
cinnabar/util.py

SYSTEM = $(shell python2.7 -c 'import platform; print platform.system()')

NO_GETTEXT ?= 1
NO_OPENSSL ?= 1
ifeq ($(SYSTEM),Windows)
NO_PTHREADS ?= 1
endif

include $(CURDIR)/Makefile

SYSTEM = $(shell python2.7 -c 'import platform; print platform.system()')
ifeq ($(SYSTEM),Windows)
CFLAGS += -DCURL_STATICLIB
endif
Expand Down Expand Up @@ -133,6 +137,7 @@ EXCLUDE_OBJS += bitmap.o
EXCLUDE_OBJS += blame.o
EXCLUDE_OBJS += checkout.o
EXCLUDE_OBJS += compat/mingw.o
EXCLUDE_OBJS += compat/win32/pthread.o
EXCLUDE_OBJS += connect.o
EXCLUDE_OBJS += default.o
EXCLUDE_OBJS += help.o
Expand Down

0 comments on commit 5c9a81f

Please sign in to comment.