X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=caf8b2f22bfcd05d7d248e547d0246d1763ffeb1;hb=c22675b5428d579d4eca15ee8a0ff701942738c4;hp=1173631972a0a80e550acc4448e44d8770b66fc3;hpb=b25a0934cc9961f4988d01e4181b7dad046e03fc;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 1173631972a..caf8b2f22bf 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 into five groups of four consisting of one 
-# large and three small executables. This is done to minimize memory load 
+
+# 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.
-PARALLEL_DIRS := llvm-config  \
-                 opt llvm-as llvm-dis llvm-upgrade \
+DIRS := llvm-config
+PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
-                 llvm-ld llvmc llvm-prof llvm-link \
-		 lli gccas gccld llvm-extract llvm-db llvm2cpp \
-		 bugpoint llvm-bcanalyzer llvm-stub
+                 llvm-ld llvm-prof llvm-link \
+                 lli 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 Windows until compatability is determined.
-ifneq ($(OS), MingW)
-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 ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+  DIRS := $(filter-out lto gold, $(DIRS))
 endif
 
 include $(LEVEL)/Makefile.common