Fix a problem exposed by my previous commit and noticed by a release-asserts

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 9f1051c1c8c23265484214552ad11e8e403836ce..9d2e576dfbdcbb149269d6a2a310c3ffaa704dea 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,57 @@
-LEVEL = ..
-PARALLEL_DIRS = as dis opt gccas llc link lli gccld analyze extract jello
+##===- tools/Makefile --------------------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/Makefile.common
+LEVEL := ..
+
+# 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.
+
+# libEnhancedDisassembly must be built ahead of llvm-mc
+# because llvm-mc links against libEnhancedDisassembly
+DIRS := llvm-config edis llvm-mc
+PARALLEL_DIRS := opt llvm-as llvm-dis \
+                 llc llvm-ranlib llvm-ar llvm-nm \
+                 llvm-ld llvm-prof llvm-link \
+                 lli llvm-extract \
+                 bugpoint llvm-bcanalyzer llvm-stub \
+                 llvmc
+
+# Let users override the set of tools to build from the command line.
+ifdef ONLY_TOOLS
+  OPTIONAL_PARALLEL_DIRS :=
+  PARALLEL_DIRS := $(ONLY_TOOLS)
+endif
 
+include $(LEVEL)/Makefile.config
+
+# These libraries build as dynamic libraries (.dylib /.so), they can only be
+# built if ENABLE_PIC is set.
+ifeq ($(ENABLE_PIC),1)
+  # No support for dynamic libraries on windows targets.
+  ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+    # gold only builds if binutils is around.  It requires "lto" to build before
+    # it so it is added to DIRS.
+    ifdef BINUTILS_INCDIR
+      DIRS += lto gold
+    else
+      PARALLEL_DIRS += lto
+    endif
+  endif
+endif
+
+# Don't build edis if we explicitly disabled it.
+ifeq ($(DISABLE_EDIS),1)
+  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+endif
+
+include $(LEVEL)/Makefile.common