[llvm-commits] [llvm] r125956 - /llvm/trunk/tools/Makefile

[Stephen Wilson]

Author: wilsons
Date: Fri Feb 18 14:50:33 2011
New Revision: 125956

URL: http://llvm.org/viewvc/llvm-project?rev=125956&view=rev
Log:
This patch lets LLDB build as an LLVM subproject.  LLDB is not built in
parallel with the rest of the tools directory as it depends on Clang.


Modified:
    llvm/trunk/tools/Makefile

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=125956&r1=125955&r2=125956&view=diff
==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Fri Feb 18 14:50:33 2011
@@ -12,6 +12,10 @@
 # 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 @@
 # 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