aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Wilson <wilsons@start.ca>2011-02-18 20:50:33 +0000
committerStephen Wilson <wilsons@start.ca>2011-02-18 20:50:33 +0000
commitebdf0f9e0c0b67e5d173227dc76779f5afdccb8f (patch)
tree2c520d092e7a20be884faf6769831d047d964300
parent8bba1a5ef0f8a71de2e58c7f05b8714a73464ca8 (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125956 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--tools/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 71c2f53b32..731024763b 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