Fix PR2369 by making scalarrepl more careful about promoting

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index edcfb157bb02bdc9f1c5612c883e95748696a92a..d742f41bd65caf8dff27b692eec803e17dd39719 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,15 +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-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
+
+# 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