mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Pthread link flags configurable

Browse Source 
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>
This commit is contained in:
David M. Syzdek
2008-11-02 14:43:20 -09:00
committed by Junio C Hamano
parent 069bb5765c
commit 158629b2c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -229,6 +229,7 @@ INSTALL = install
RPMBUILD = rpmbuild RPMBUILD = rpmbuild
TCL_PATH = tclsh TCL_PATH = tclsh
TCLTK_PATH = wish TCLTK_PATH = wish
PTHREAD_LIBS = -lpthread
export TCL_PATH TCLTK_PATH export TCL_PATH TCLTK_PATH
@ -695,6 +696,7 @@ ifeq ($(uname_S),FreeBSD)
COMPAT_CFLAGS += -Icompat/regex COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o COMPAT_OBJS += compat/regex/regex.o
ifeq ($(shell expr "$(uname_R)" : '4\.'),2) ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
PTHREAD_LIBS = -pthread
NO_UINTMAX_T = YesPlease NO_UINTMAX_T = YesPlease
NO_STRTOUMAX = YesPlease NO_STRTOUMAX = YesPlease
endif endif
@ -1023,7 +1025,7 @@ endif
ifdef THREADED_DELTA_SEARCH ifdef THREADED_DELTA_SEARCH
BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
EXTLIBS += -lpthread EXTLIBS += $(PTHREAD_LIBS)
LIB_OBJS += thread-utils.o LIB_OBJS += thread-utils.o
endif endif
ifdef DIR_HAS_BSD_GROUP_SEMANTICS ifdef DIR_HAS_BSD_GROUP_SEMANTICS