X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=tools%2FMakefile;h=d742f41bd65caf8dff27b692eec803e17dd39719;hb=73b43b9b549a75fb0015c825df68abd95705a67c;hp=a90fa4728583f40a7f5c932f7662f7c99348444c;hpb=cd18a8333ea0c05cbccbeef1d3bcce08c975d1dc;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index a90fa472858..d742f41bd65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,22 +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 llvm-ranlib llvm-bcanalyzer llee llvmc llvm-ld 
+# 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
 
-EXTRA_DIST := Makefile.JIT
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(ARCH), Sparc)
-PARALLEL_DIRS := $(filter-out llee, $(PARALLEL_DIRS))
+# 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