Index: lldb/trunk/lib/Makefile
===================================================================
--- lldb/trunk/lib/Makefile
+++ lldb/trunk/lib/Makefile
@@ -188,7 +188,7 @@
     # Don't allow unresolved symbols.
     LLVMLibsOptions += -Wl,--no-undefined
     # Link in python
-    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel
+    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread
     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
 endif
 
@@ -200,5 +200,5 @@
     LLVMLibsOptions += -Wl,--allow-shlib-undefined
     # Link in python
     LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo \
-                       -ledit -lncurses -lpanel
+                       -ledit -lncurses -lpanel -lpthread
 endif
Index: lldb/trunk/tools/lldb-mi/Makefile
===================================================================
--- lldb/trunk/tools/lldb-mi/Makefile
+++ lldb/trunk/tools/lldb-mi/Makefile
@@ -22,11 +22,11 @@
 endif
 
 ifneq (,$(filter $(HOST_OS), Linux GNU/kFreeBSD))
-	LLVMLibsOptions += -Wl,-rpath,$(LibDir)
+	LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread
 endif
 
 ifeq ($(HOST_OS),FreeBSD)
 	CPP.Flags += -I/usr/include/edit #-v
-	LLVMLibsOptions += -Wl,-rpath,$(LibDir)
+	LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread
 endif
 
Index: lldb/trunk/tools/lldb-server/Makefile
===================================================================
--- lldb/trunk/tools/lldb-server/Makefile
+++ lldb/trunk/tools/lldb-server/Makefile
@@ -21,5 +21,5 @@
 endif
 
 ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD))
-	LLVMLibsOptions += -Wl,-rpath,$(LibDir)
+	LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread
 endif