Adding tests for the Intel JIT event listener's MCJIT support.

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index c2b12e72117be86fa1b3127c8fe31580c7865999..7872267d176a4ae7123d0d1666fbb343cab24e05 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,8 +9,19 @@
 
 LEVEL := ..
 
+include $(LEVEL)/Makefile.config
+
 # Build clang if present.
-OPTIONAL_PARALLEL_DIRS := clang
+
+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
@@ -18,46 +29,47 @@ OPTIONAL_PARALLEL_DIRS := clang
 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 \
-                 bugpoint llvm-bcanalyzer llvm-stub \
-                 llvm-mc llvmc
+                 llvm-prof llvm-link \
+                 lli llvm-extract llvm-mc \
+                 bugpoint llvm-bcanalyzer \
+                 llvm-diff macho-dump llvm-objdump llvm-readobj \
+                llvm-rtdyld llvm-dwarfdump llvm-cov llvm-jitlistener \
+                llvm-size llvm-stress llvm-mcmarkup \
+                llvm-symbolizer
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
   OPTIONAL_PARALLEL_DIRS :=
-  PARALLEL_DIRS := $(ONLY_TOOLS)
+  OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS))
+  PARALLEL_DIRS := $(filter-out lldb,$(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.
+ifndef ONLY_TOOLS
 ifeq ($(ENABLE_PIC),1)
-  # No support for dynamic libraries on windows targets.
-  ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
-    # libEnhancedDisassembly must be built ahead of llvm-mc
-    # because llvm-mc links against libEnhancedDisassembly
-    DIRS += edis
-
-    # 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
+  # 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
 endif
 
-# Only build edis if X86 target support is enabled.
-ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
-  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+ifdef LLVM_HAS_POLLY
+  PARALLEL_DIRS += polly
+endif
 endif
 
-# Don't build edis if we explicitly disabled it.
-ifeq ($(DISABLE_EDIS),1)
-  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+# 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