X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=tools%2FMakefile;h=d742f41bd65caf8dff27b692eec803e17dd39719;hb=ebcba612b537f45a033ccd9a60bee0c45e2e2ded;hp=6f71cf40b3ce8b2b3f44e8d8f5f57c99797d5b8c;hpb=8248f11d26b28cdefd064ad5c3081834998d93ae;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 6f71cf40b3c..d742f41bd65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,6 +1,32 @@
+##===- tools/Makefile --------------------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc link lli gccld \
-                 analyze extract bugpoint llvm-ar
+# 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 \
+                 llc llvm-ranlib llvm-ar llvm-nm \
+                 llvm-ld llvm-prof llvm-link \
+		 lli gccas gccld llvm-extract llvm-db \
+		 bugpoint llvm-bcanalyzer llvm-stub llvmc2
 
-include $(LEVEL)/Makefile.common
 
+include $(LEVEL)/Makefile.config
+
+# Disable liblto as it is going away
+#PARALLEL_DIRS += lto
+
+# only build new lto project on Darwin for now
+ifeq ($(OS),Darwin)
+PARALLEL_DIRS += lto2
+endif
+
+include $(LEVEL)/Makefile.common