Skip to content

Commit 767f8b3

Browse files
michaellukashovgitster
authored andcommitted
Windows: Remove dependency on pthreadGC2.dll
Commit 44626dc (MSVC: Windows-native implementation for subset of threads API, 2010-01-15) introduces builtin replacement of pthreadGC2.dll functionality, thus we can completely drop dependency on this dll. Signed-off-by: Michael Lukashov <[email protected]> Acked-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0ed3a11 commit 767f8b3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@ ifeq ($(uname_S),Windows)
994994
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
995995
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
996996
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
997+
PTHREAD_LIBS =
997998
lib =
998999
ifndef DEBUG
9991000
BASIC_CFLAGS += -GL -Os -MT
@@ -1036,11 +1037,12 @@ ifneq (,$(findstring MINGW,$(uname_S)))
10361037
NO_PYTHON = YesPlease
10371038
BLK_SHA1 = YesPlease
10381039
THREADED_DELTA_SEARCH = YesPlease
1039-
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch
1040+
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
10401041
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
10411042
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
10421043
compat/win32/pthread.o
10431044
EXTLIBS += -lws2_32
1045+
PTHREAD_LIBS =
10441046
X = .exe
10451047
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
10461048
htmldir=doc/git/html/

0 commit comments

Comments
 (0)