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

diff --git a/tools/Makefile b/tools/Makefile
index 909a54843b5..caf8b2f22bf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,18 +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 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
 
 ifeq ($(ENABLE_PIC),1)
-PARALLEL_DIRS += lto
+  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