aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-19 21:43:01 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-19 21:43:01 -0700
commit652b0bbe09c909eb5aa34be8746071f1c5c0e73d (patch)
treee9d028168728cb171a412024d5c15a59671987ac /Makefile
parent0208c9611ab4e82b09feba857c4f9bc8e02a6d9d (diff)
parent38bd64979a2a3ffa178af801c6a62e6fcd658274 (diff)
downloadgit-652b0bbe09c909eb5aa34be8746071f1c5c0e73d.tar.gz
git-652b0bbe09c909eb5aa34be8746071f1c5c0e73d.tar.xz
Merge branch 'ph/enable-threaded'
* ph/enable-threaded: Enable threaded delta search on *BSD and Linux.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ad77a1dc8..5e944d8a1 100644
--- a/Makefile
+++ b/Makefile
@@ -578,9 +578,11 @@ EXTLIBS =
ifeq ($(uname_S),Linux)
NO_STRLCPY = YesPlease
+ THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),GNU/kFreeBSD)
NO_STRLCPY = YesPlease
+ THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),UnixWare)
CC = cc
@@ -678,6 +680,7 @@ ifeq ($(uname_S),FreeBSD)
BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
+ THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
@@ -685,6 +688,7 @@ ifeq ($(uname_S),OpenBSD)
NEEDS_LIBICONV = YesPlease
BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib
+ THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -693,6 +697,7 @@ ifeq ($(uname_S),NetBSD)
BASIC_CFLAGS += -I/usr/pkg/include
BASIC_LDFLAGS += -L/usr/pkg/lib
ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
+ THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),AIX)
NO_STRCASESTR=YesPlease