summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTed Pavlic <ted@tedpavlic.com>2009-01-26 19:03:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-26 23:11:37 (GMT)
commitf7d9d04e3be697989c960881f9b0d50f1ea6a6be (patch)
treeb3a4323397ebd4040a9a275bbfc913292283f845 /Makefile
parentdfb047b9e4f7f66c5322ef642f21fd92b0a975e3 (diff)
downloadgit-f7d9d04e3be697989c960881f9b0d50f1ea6a6be.zip
git-f7d9d04e3be697989c960881f9b0d50f1ea6a6be.tar.gz
git-f7d9d04e3be697989c960881f9b0d50f1ea6a6be.tar.bz2
make: Remove -pthread on Darwin (it is included by cstdlib).
As discussed in http://lists.apple.com/archives/Unix-porting/2005/Mar/msg00019.html the Mac OS X C standard library is always thread safe and always includes the pthread library. So explicitly using -pthread causes an 'unrecognized option' compiler warning. This patch clears PTHREAD_LIBS if Darwin is detected. Signed-off-by: Ted Pavlic <ted@tedpavlic.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b4d9cb4..9d451cf 100644
--- a/Makefile
+++ b/Makefile
@@ -817,6 +817,7 @@ ifeq ($(uname_S),Darwin)
BASIC_LDFLAGS += -L/opt/local/lib
endif
endif
+ PTHREAD_LIBS =
endif
ifndef CC_LD_DYNPATH