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

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index f1abf931a403fee7de3b1de09f783b1186a70dd7..237da53bfb9de9a71810606e9f9f1c708916312f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,30 +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 := ..
-# 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 llvm-upgrade \
-                 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
+
+# Build clang if present.
+OPTIONAL_PARALLEL_DIRS := clang
+
+# 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
 
-# Disable liblto on non-darwin platforms right now until LLVM is built PIC.
-ifeq ($(OS), Darwin)
-PARALLEL_DIRS += lto
+ifeq ($(ENABLE_PIC),1)
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
 endif
 
 include $(LEVEL)/Makefile.common