Reapply r65755, but reversing "<" to ">=".

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 2c0040055082470ce613d9d03402bd10e1368eca..237da53bfb9de9a71810606e9f9f1c708916312f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,31 +1,34 @@
 ##===- tools/Makefile --------------------------------------*- Makefile -*-===##
-# 
+#
 #                     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 
 
-# 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.
-ifneq($(OS),Win32)
-PARALLEL_DIRS += bugpoint llvm-db 
-endif
+# Build clang if present.
+OPTIONAL_PARALLEL_DIRS := clang
 
-EXTRA_DIST := Makefile.JIT
+# 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.
+DIRS := llvm-config
+PARALLEL_DIRS := 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 llvmc
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(ARCH), Sparc)
-PARALLEL_DIRS := $(filter-out llee, $(PARALLEL_DIRS))
+ifeq ($(ENABLE_PIC),1)
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
 endif
 
 include $(LEVEL)/Makefile.common