X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=4f0f54bdfbf84c1dd117880783beaba6e03231fd;hb=65f57c233cd4499e2e8b52a503201e64edfd6a9e;hp=ae3598bbdcc71420f18dfb916873c16a62feefb2;hpb=aa91978ea2d08fcd8323ccc228e59ee9b71702d1;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index ae3598bbdcc..4f0f54bdfbf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,29 +1,46 @@
 ##===- 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 := ..
-# Note .. the tools are organized in triples consisting of one large and two
-# 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 \
-		 lli llvm-link llvm-nm \
-		 bugpoint llvm-db llvm-extract \
-                 gccas llvm-bcanalyzer llvm-stub \
-		 gccld llvm2cpp \
-                 llvm-ld llvmc llvm-prof
 
-include $(LEVEL)/Makefile.common
+# 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 \
+                 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
 
-# Disable liblto on non-darwin platforms right now until LLVM is built PIC.
-ifeq ($(OS), Darwin)
-PARALLEL_DIRS += lto
+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