X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=d742f41bd65caf8dff27b692eec803e17dd39719;hb=0011dc4738fbe624d44197ef9496517fd093eaa4;hp=b2b47504dbcf48d4f2cbd856939405211552da6d;hpb=9141f033226230f0822bb62dfdb67e48ae753245;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index b2b47504dbc..d742f41bd65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,25 +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 llvm-nm llvm-prof llvm-ar llvm-ranlib \
-                 llvm-bcanalyzer llvmc llvm-ld llvm-db bugpoint
+# 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.config
 
-# 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.
+# Disable liblto as it is going away
+#PARALLEL_DIRS += lto
 
-ifeq ($(OS),Win32)
-PARALLEL_DIRS := $(filter-out bugpoint llvm-db,$(PARALLEL_DIRS))
+# only build new lto project on Darwin for now
+ifeq ($(OS),Darwin)
+PARALLEL_DIRS += lto2
 endif
 
-include $(BUILD_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common