X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=3d2c1f052e7dc9f10b318b46e4c126bf4f2a7642;hb=c9c448ffa2bb7fe1bac80a7bc014740bb7b403fd;hp=7a062e54f1eeabc45130ade4cfb88ec2e041f8a6;hpb=ab96bb1df3987b94fcd897e97f917ecd064deed3;p=oota-llvm.git

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