For PR1187:

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index dd03498bea58ce8ab15e1b4ba34a32df246e5d45..c12f0799dc21103a07d70660cbdc55e38338d2bf 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,9 +8,23 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
-                 analyze extract bugpoint llvm-nm llvm-prof llvm-db llvm-ar \
-                llvm-abcd
+# 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 llvm-upgrade \
+                 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
 
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config
+
+# Disable liblto on Windows until compatability is determined.
+ifneq ($(OS), MingW)
+PARALLEL_DIRS += lto
+endif
 
+include $(LEVEL)/Makefile.common