Normalize SourceMgr messages.

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 0cf613a3058a537b2f3e467775ca153b6e2d149e..32b9965bb4bd5b55c7e77c549c5852b9d6100378 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,22 +15,32 @@ 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 \
+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
-
+                 lli gccas gccld llvm-extract llvm-db \
+                 bugpoint llvm-bcanalyzer llvm-stub \
+                 llvm-mc
+
+# 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)
-PARALLEL_DIRS += lto
-
-ifdef BINUTILS_INCDIR
-PARALLEL_DIRS += gold
+  DIRS += lto llvmc
+  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