summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 069bb57)
raw | patch | inline | side by side (parent: 069bb57)
author | David M. Syzdek <david.syzdek@acsalaska.net> | |
Sun, 2 Nov 2008 23:43:20 +0000 (14:43 -0900) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 3 Nov 2008 00:41:41 +0000 (16:41 -0800) |
FreeBSD 4.x systems use the linker flags `-pthread' instead of the
linker flags `-lpthread' when linking against the pthread library.
Signed-off-by: David M. Syzdek <david.syzdek@acsalaska.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
linker flags `-lpthread' when linking against the pthread library.
Signed-off-by: David M. Syzdek <david.syzdek@acsalaska.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 426e1a652f23e55bf74f1c9024087d21cf285b49..02f68e05f5f78def774b02ab6af843bc48a9f0c9 100644 (file)
--- a/Makefile
+++ b/Makefile
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
+PTHREAD_LIBS = -lpthread
export TCL_PATH TCLTK_PATH
COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o
ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
+ PTHREAD_LIBS = -pthread
NO_UINTMAX_T = YesPlease
NO_STRTOUMAX = YesPlease
endif
ifdef THREADED_DELTA_SEARCH
BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
- EXTLIBS += -lpthread
+ EXTLIBS += $(PTHREAD_LIBS)
LIB_OBJS += thread-utils.o
endif
ifdef DIR_HAS_BSD_GROUP_SEMANTICS