X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=86ba72ddacc6a40a58fc576becc14da08ea5e46a;hb=e5605778f5851f46c94524988af35d6a3e45318c;hp=3e96213d8c360be3e8a0366dd61383dfcd0e67eb;hpb=2e1284d569d42e4ac94f3daee57d38d47d3c1a58;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 3e96213d8c3..86ba72ddacc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,25 +1,58 @@
 ##===- 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 := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
-                 analyze llvm-extract llvm-nm llvm-prof llvm-ar llvm-ranlib \
-                 llvm-bcanalyzer llvmc llvm-ld llvm-db bugpoint llvm-config 
+
+# 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.
+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
+                 
+
+# 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
 
-# The bugpoint and llvm-db tools are not portable to Win32 because they depend
-# on fork(2) behavior that Win32 doesn't have. At some point they'll be 
-# rewritten to not depend on fork at which time they should be added back to
-# the list above.
-ifneq ($(LLVM_ON_UNIX),1)
-PARALLEL_DIRS := $(filter-out bugpoint llvm-db,$(PARALLEL_DIRS))
+# 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))
+    PARALLEL_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
+      PARALLEL_DIRS += gold
+      DIRS += lto
+    else
+      PARALLEL_DIRS += lto
+    endif
+  endif
+endif
+
+# Only build edis if X86 target support is enabled.
+ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
+  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
 endif
 
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common