From: Owen Anderson <resistor@mac.com>
Date: Fri, 18 Feb 2011 21:33:23 +0000 (+0000)
Subject: Revert r125956, which broke the build if you _don't_ have lldb checked out.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d78b7891104e7110d6e71646f98c4f07d814e6b3;p=oota-llvm.git

Revert r125956, which broke the build if you _don't_ have lldb checked out.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125964 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/Makefile b/tools/Makefile
index 731024763b3..71c2f53b323 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,10 +12,6 @@ LEVEL := ..
 # Build clang if present.
 OPTIONAL_PARALLEL_DIRS := clang
 
-# Build LLDB if present. Note LLDB must be built last as it depends on the
-# wider LLVM infrastructure (including Clang). 
-OPTIONAL_DIRS := lldb
-
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
@@ -30,8 +26,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
   OPTIONAL_PARALLEL_DIRS :=
-  OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS))
-  PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS))
+  PARALLEL_DIRS := $(ONLY_TOOLS)
 endif
 
 include $(LEVEL)/Makefile.config