Normalize SourceMgr messages.

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 237da53bfb9de9a71810606e9f9f1c708916312f..32b9965bb4bd5b55c7e77c549c5852b9d6100378 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -20,15 +20,27 @@ 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
+                 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)
-  DIRS += lto
+  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