X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=d742f41bd65caf8dff27b692eec803e17dd39719;hb=31ce08facea459c8793bd24d64054b1b0b763356;hp=bc252aa424b75aa6d9e2d1c911cbd23197849126;hpb=0ed1f38ea642d0a0ddbb5db7f9002c95dbd00cea;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index bc252aa424b..d742f41bd65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,14 +2,31 @@
 # 
 #                     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 := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
-                 analyze extract bugpoint llvm-nm llvm-prof llvm-db 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