Move type handling to make sure we get all created types that aren't

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 6a1ad5eb4e78a4a05c9e50ac16f1a44035e55b36..2da39177815235f8257a85395cc6109eaf7654e1 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,30 +1,82 @@
 ##===- 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 \
-                 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
 
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config
+
+# Build clang if present.
+
+ifneq ($(CLANG_SRC_ROOT),)
+  OPTIONAL_PARALLEL_DIRS := $(CLANG_SRC_ROOT)
+else
+  OPTIONAL_PARALLEL_DIRS := clang
+endif
+
+# Build LLDB if present. Note LLDB must be built last as it depends on the
+# wider LLVM infrastructure (including Clang).
+OPTIONAL_DIRS := lldb
+
+# 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 llvm-extract llvm-mc \
+                 bugpoint llvm-bcanalyzer llvm-stub \
+                 llvm-diff macho-dump llvm-objdump \
+                llvm-rtdyld llvm-dwarfdump llvm-cov \
+                llvm-size
+
+# Let users override the set of tools to build from the command line.
+ifdef ONLY_TOOLS
+  OPTIONAL_PARALLEL_DIRS :=
+  OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS))
+  PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS))
+endif
+
+# These libraries build as dynamic libraries (.dylib /.so), they can only be
+# built if ENABLE_PIC is set.
+ifndef ONLY_TOOLS
+ifeq ($(ENABLE_PIC),1)
+  # 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
+
+  PARALLEL_DIRS += bugpoint-passes
+
+  # The edis library is only supported if ARM and/or X86 are enabled, and if
+  # LLVM is being built PIC on platforms that support dylibs.
+  ifneq ($(DISABLE_EDIS),1)
+    ifneq ($(filter $(TARGETS_TO_BUILD), X86 ARM),)
+      PARALLEL_DIRS += edis
+    endif
+  endif
+endif
+
+ifdef LLVM_HAS_POLLY
+  PARALLEL_DIRS += polly
+endif
+endif
 
-# Disable liblto on non-darwin platforms right now until LLVM is built PIC.
-ifeq ($(OS), Darwin)
-PARALLEL_DIRS += lto
+# On Win32, loadable modules can be built with ENABLE_SHARED.
+ifneq ($(ENABLE_SHARED),1)
+  ifneq (,$(filter $(HOST_OS), Cygwin MingW))
+    PARALLEL_DIRS := $(filter-out bugpoint-passes, \
+                        $(PARALLEL_DIRS))
+  endif
 endif
 
 include $(LEVEL)/Makefile.common