From ebccf0891a2f6b75c2ac8de97557ca0cf5ad61c3 Mon Sep 17 00:00:00 2001 From: Stephen Wilson Date: Sun, 20 Feb 2011 04:17:15 +0000 Subject: [PATCH] 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. This patch was first applied in r125956 and subsequently reverted in r125964 as it broke in-tree builds. Makefile.rules was fixed up in r126070 to handle missing optional directories for the in-tree case, so it should be safe now to bring this patch back in. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126071 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 71c2f53b323..731024763b3 100644 --- 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