Revert r144300 "llvm-config: Replace with C++ version (was llvm-config-2).",

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index abb6e85dd3c2eaf9867259550734da4cf97ddccd..278546bc1625b7e02c7d6bcf44a1d2da0712422f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,8 +9,15 @@
 
 LEVEL := ..
 
+include $(LEVEL)/Makefile.config
+
 # Build clang if present.
-OPTIONAL_PARALLEL_DIRS := clang
+
+ifneq ($(CLANG_SRC_ROOT),)
+  OPTIONAL_PARALLEL_DIRS := $(CLANG_SRC_ROOT)
+else
+  OPTIONAL_PARALLEL_DIRS := clang
+endif
 
 # Build LLDB if present. Note LLDB must be built last as it depends on the
 # wider LLVM infrastructure (including Clang).
@@ -26,7 +33,8 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  lli llvm-extract llvm-mc \
                  bugpoint llvm-bcanalyzer llvm-stub \
                  llvm-diff macho-dump llvm-objdump \
-                llvm-rtdyld llvm-dwarfdump
+                llvm-rtdyld llvm-dwarfdump llvm-cov \
+                llvm-size llvm-config-2
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
@@ -35,9 +43,6 @@ ifdef ONLY_TOOLS
   PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS))
 endif
 
-include $(LEVEL)/Makefile.config
-
-
 # These libraries build as dynamic libraries (.dylib /.so), they can only be
 # built if ENABLE_PIC is set.
 ifndef ONLY_TOOLS