diff options
| author | David M. Syzdek <david.syzdek@acsalaska.net> | 2008-11-02 14:43:20 -0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:41:41 -0800 |
| commit | 158629b2c9baffd0352306bd8dfa0784c981955d (patch) | |
| tree | ebda7b05cd7c8cc5853ffb82c6fa8dfd363ede92 | |
| parent | 069bb5765c04645313d79a1eb345a4fb8fe7f06c (diff) | |
| download | git-158629b2c9baffd0352306bd8dfa0784c981955d.tar.gz git-158629b2c9baffd0352306bd8dfa0784c981955d.tar.xz | |
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 <david.syzdek@acsalaska.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |