Index: lldb/trunk/test/functionalities/thread/create_after_attach/Makefile
===================================================================
--- lldb/trunk/test/functionalities/thread/create_after_attach/Makefile
+++ lldb/trunk/test/functionalities/thread/create_after_attach/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 C_SOURCES := main.c
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/test/functionalities/thread/exit_during_step/Makefile
===================================================================
--- lldb/trunk/test/functionalities/thread/exit_during_step/Makefile
+++ lldb/trunk/test/functionalities/thread/exit_during_step/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/test/functionalities/thread/jump/Makefile
===================================================================
--- lldb/trunk/test/functionalities/thread/jump/Makefile
+++ lldb/trunk/test/functionalities/thread/jump/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp other.cpp
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/test/functionalities/thread/thread_exit/Makefile
===================================================================
--- lldb/trunk/test/functionalities/thread/thread_exit/Makefile
+++ lldb/trunk/test/functionalities/thread/thread_exit/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/test/lldbtest.py
===================================================================
--- lldb/trunk/test/lldbtest.py
+++ lldb/trunk/test/lldbtest.py
@@ -1525,11 +1525,12 @@
         
         return os.environ["CC"]
 
-    def getBuildFlags(self, use_cpp11=True, use_libcxx=False, use_libstdcxx=False, use_pthreads=True):
+    def getBuildFlags(self, use_cpp11=True, use_libcxx=False, use_libstdcxx=False):
         """ Returns a dictionary (which can be provided to build* functions above) which
             contains OS-specific build flags.
         """
         cflags = ""
+        ldflags = ""
 
         # On Mac OS X, unless specifically requested to use libstdc++, use libc++
         if not use_libstdcxx and sys.platform.startswith('darwin'):
@@ -1554,9 +1555,6 @@
         elif "clang" in self.getCompiler():
             cflags += " -stdlib=libstdc++"
 
-        if use_pthreads:
-            ldflags = "-lpthread"
-
         return {'CFLAGS_EXTRAS' : cflags,
                 'LD_EXTRAS' : ldflags,
                }