This patch lets LLDB build as an LLVM subproject. LLDB is not built in

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 71c2f53b32391334c56954d3a32b01ed229a7083..731024763b3a9f8e4f26ac7468c5d821d85484d8 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,6 +12,10 @@ 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.
@@ -26,7 +30,8 @@ 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 :=
-  PARALLEL_DIRS := $(ONLY_TOOLS)
+  OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS))
+  PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS))
 endif
 
 include $(LEVEL)/Makefile.config