X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=0340c7f78bb983f4c1734ab7f2fd027f66b5f95b;hb=54482b472a888c9efe003ad694ecf47b21878f0e;hp=6a1ad5eb4e78a4a05c9e50ac16f1a44035e55b36;hpb=70c3537a9244f6095bbcde10a90791604560a2d8;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 6a1ad5eb4e7..0340c7f78bb 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,30 +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 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
+
+ifeq ($(ENABLE_PIC),1)
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
+endif
 
-# Disable liblto on non-darwin platforms right now until LLVM is built PIC.
-ifeq ($(OS), Darwin)
-PARALLEL_DIRS += lto
+# No support for lto / gold on windows targets
+ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+  DIRS := $(filter-out lto gold, $(DIRS))
 endif
 
 include $(LEVEL)/Makefile.common