summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/make
diff options
context:
space:
mode:
authorTamas Berghammer <tberghammer@google.com>2015-12-15 12:11:00 +0000
committerTamas Berghammer <tberghammer@google.com>2015-12-15 12:11:00 +0000
commit0ecdae1bdca95fb69985fac0dbf9332b0df759ae (patch)
tree5182a5fb0e2c1be126b98b22c25b66ddd1660eb3 /lldb/packages/Python/lldbsuite/test/make
parentd60e2a3ebfe8a2e40e7b396ac5eba5ac8c53a62c (diff)
downloadbcm5719-llvm-0ecdae1bdca95fb69985fac0dbf9332b0df759ae.tar.gz
bcm5719-llvm-0ecdae1bdca95fb69985fac0dbf9332b0df759ae.zip
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
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make')
-rw-r--r--lldb/packages/Python/lldbsuite/test/make/Makefile.rules2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud