X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=b7375c9970ba406c28453eb479dff36544fc0bfc;hb=ac226bbf457f6b5e5210a4a82b1ce678298b2d89;hp=a296f8187024aabd6a6da33f959a0db91e7ff946;hpb=535e3e8df963e2d8327718518efd9ddc31faf42a;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index a296f818702..b7375c9970b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,29 +9,72 @@
 
 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
 # in parallel builds.  Please retain this ordering.
-PARALLEL_DIRS := llvm-config  \
-                 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
+DIRS := llvm-config
+PARALLEL_DIRS := opt llvm-as llvm-dis \
+                 llc llvm-ar llvm-nm \
+                 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-size llvm-stress llvm-mcmarkup \
+	         llvm-symbolizer obj2yaml yaml2obj
+
+# If Intel JIT Events support is configured, build an extra tool to test it.
+ifeq ($(USE_INTEL_JITEVENTS), 1)
+  PARALLEL_DIRS += llvm-jitlistener
+endif
 
+# 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
 
-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)
+  # 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
 
-# only build new lto project on Darwin for now
-ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto
+  PARALLEL_DIRS += bugpoint-passes
+endif
 
-ifdef BINUTILS_INCDIR
-PARALLEL_DIRS += gold
+ifdef LLVM_HAS_POLLY
+  PARALLEL_DIRS += polly
+endif
 endif
+
+# 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