Index: lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../make
 
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
@@ -1,5 +1,5 @@
 LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
@@ -2,5 +2,5 @@
 
 CXXFLAGS += -std=c++11
 CXX_SOURCES := ParallelTask.cpp
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
@@ -1,5 +1,5 @@
 LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
@@ -1,5 +1,5 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-ENABLE_STD_THREADS := YES
-include $(LEVEL)/Makefile.rules
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+ENABLE_THREADS := YES
+include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../make
 
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../make
 
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../make
 
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -208,7 +208,7 @@
 LDFLAGS ?= $(CFLAGS)
 LDFLAGS += $(LD_EXTRAS)
 ifeq (,$(filter $(OS), Windows_NT Android))
-	ifneq (,$(filter YES,$(ENABLE_THREADS) $(ENABLE_STD_THREADS)))
+	ifneq (,$(filter YES,$(ENABLE_THREADS)))
 		LDFLAGS += -pthread
 	endif
 endif
Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../make
 
-ENABLE_STD_THREADS := YES
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules