From 158629b2c9baffd0352306bd8dfa0784c981955d Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Sun, 2 Nov 2008 14:43:20 -0900 Subject: Make Pthread link flags configurable 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 Signed-off-by: Junio C Hamano --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 426e1a652f..02f68e05f5 100644 --- a/Makefile +++ b/Makefile @@ -229,6 +229,7 @@ INSTALL = install RPMBUILD = rpmbuild TCL_PATH = tclsh TCLTK_PATH = wish +PTHREAD_LIBS = -lpthread export TCL_PATH TCLTK_PATH @@ -695,6 +696,7 @@ ifeq ($(uname_S),FreeBSD) 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 @@ -1023,7 +1025,7 @@ 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 -- cgit v1.2.3