-# Note .. the tools are organized in triples consisting of one large and two
-# small executables. This is done to minimize memory load in parallel builds.
-# Please retain this ordering.
-PARALLEL_DIRS := llvm-config \
- opt llvm-as llvm-dis \
- llc llvm-ranlib llvm-ar \
- lli llvm-link llvm-nm \
- bugpoint llvm-db llvm-extract \
- gccas llvm-bcanalyzer llvm-stub \
- gccld llvm2cpp \
- llvm-ld llvmc llvm-prof
+
+# Build clang if present.
+OPTIONAL_PARALLEL_DIRS := clang
+
+# 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.
+
+# libEnhancedDisassembly must be built ahead of llvm-mc
+# because llvm-mc links against libEnhancedDisassembly
+DIRS := llvm-config edis llvm-mc
+PARALLEL_DIRS := opt llvm-as llvm-dis \
+ llc llvm-ranlib llvm-ar llvm-nm \
+ llvm-ld llvm-prof llvm-link \
+ lli llvm-extract \
+ bugpoint llvm-bcanalyzer llvm-stub \
+ llvmc
+
+# Let users override the set of tools to build from the command line.
+ifdef ONLY_TOOLS
+ OPTIONAL_PARALLEL_DIRS :=
+ PARALLEL_DIRS := $(ONLY_TOOLS)
+endif