Make DwarfWriter::RecordInlinedFnStart more like the other DwarfWriter's methods:

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index e066740b1738d8bcc09da1fde92f0fffb87f3c9e..b3c015f307cb49377c99791694b89f20bdc99111 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,17 +1,45 @@
 ##===- 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-config 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
 
-OPTIONAL_DIRS := llvm2cpp
+# 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 gccas gccld llvm-extract llvm-db \
+                 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
+
+ifeq ($(ENABLE_PIC),1)
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
+endif
+
+# No support for lto / gold on windows targets
+ifeq ($(OS), $(filter $(OS), Cygwin MingW))
+  DIRS := $(filter-out lto gold, $(DIRS))
+endif
 
 include $(LEVEL)/Makefile.common