X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=30da5224a91fcbf32947bc8204d0a3aa0bd70c90;hb=066075030ad46b3494480a5f79f05443f947aca7;hp=0ff7a61c56ff07b90417763e6472a052f08acd66;hpb=615edcccda2ed18f91d6991e7dea2ddfb3476bd1;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 0ff7a61c56f..30da5224a91 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,15 +2,28 @@
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-PARALLEL_DIRS := llvmc 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-bcanalyzer
+# 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
+
+# only build new lto project on Darwin for now
+ifeq ($(OS),Darwin)
+PARALLEL_DIRS += lto
+endif
+
+include $(LEVEL)/Makefile.common