X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=d742f41bd65caf8dff27b692eec803e17dd39719;hb=9d2c9bd11377ecac24e5c7c6198153375ac72562;hp=6a1ad5eb4e78a4a05c9e50ac16f1a44035e55b36;hpb=70c3537a9244f6095bbcde10a90791604560a2d8;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 6a1ad5eb4e7..d742f41bd65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,29 +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 := ..
-# Note .. the tools are organized in triples consisting of one large and two
-# small executables. This is done to minimize memory load in parallel builds.
-# Please retain this ordering.
-PARALLEL_DIRS := llvm-config \
+# 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 \
-		 lli llvm-link llvm-nm \
-		 bugpoint llvm-db llvm-extract \
-                 gccas llvm-bcanalyzer llvm-stub \
-		 gccld llvm2cpp \
-                 llvm-ld llvmc llvm-prof
+                 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
 
-# Disable liblto on non-darwin platforms right now until LLVM is built PIC.
-ifeq ($(OS), Darwin)
-PARALLEL_DIRS += lto
+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