Fix the ValueMap copy constructor. The issue is that the map keys are value

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 9f62ff74dc5e5c20446e2f8e056268065d7439b0..6e23dac111ef04bc21c9259edd3a3c1a4539add2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,29 +1,58 @@
 ##===- tools/Makefile --------------------------------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-# 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 
+
+# 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.
-PARALLEL_DIRS := llvm-config  \
-                 opt llvm-as llvm-dis llvm-upgrade \
+DIRS := llvm-config 
+PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
-                 llvm-ld llvmc llvm-prof llvm-link \
-                lli gccas gccld llvm-extract llvm-db llvm2cpp \
-                bugpoint llvm-bcanalyzer llvm-stub
+                 llvm-ld llvm-prof llvm-link \
+                 lli llvm-extract llvm-mc \
+                 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
 
-# Disable liblto on Windows until compatability is determined.
-ifneq ($(OS), MingW)
-PARALLEL_DIRS += lto
+
+# 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
+
+    # 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
 endif
 
 include $(LEVEL)/Makefile.common