From 0ecdae1bdca95fb69985fac0dbf9332b0df759ae Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Tue, 15 Dec 2015 12:11:00 +0000 Subject: Merge ENABLE_THREADS and ENABLE_STD_THREADS markers Both of these markers are used in the test suit for annotating when a test needs multi threaded support. Previously they had slightly different meening but they converged to the point where they are used interchangably. This CL removes the ENABLE_STD_THREADS one to simplify the test suite and avoid some confusion. Differential revision: http://reviews.llvm.org/D15498 llvm-svn: 255641 --- lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite/test/make') diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 32776eb0de7..1db17fbf151 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -208,7 +208,7 @@ LD = $(CC) 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 -- cgit v1.2.3