For PR1187:

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 83c54e274d071f4cb987229c7ae9c59631f16e9b..c12f0799dc21103a07d70660cbdc55e38338d2bf 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,22 +8,23 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
-                 analyze extract llvm-nm llvm-prof llvm-ar llvm-ranlib \
-                llvm-bcanalyzer llvmc llvm-ld 
-
-# The bugpoint and llvm-db tools are not portable to Win32 because they depend
-# on fork(2) behavior that Win32 doesn't have. At some point they'll be 
-# rewritten to not depend on fork at which time they should be added back to
-# the list above.
-ifneq($(OS),Win32)
-PARALLEL_DIRS += bugpoint llvm-db 
-endif
+# 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.config
 
-ifeq ($(ARCH), Sparc)
-PARALLEL_DIRS := $(filter-out llee, $(PARALLEL_DIRS))
+# Disable liblto on Windows until compatability is determined.
+ifneq ($(OS), MingW)
+PARALLEL_DIRS += lto
 endif
 
 include $(LEVEL)/Makefile.common