X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=caf8b2f22bfcd05d7d248e547d0246d1763ffeb1;hb=26207e5bf1123a793bd9b38bcda2f569a6b45ef2;hp=756d7d58c3c783d27135305f61f89d3b7ab3750f;hpb=911c60630f95312a356a5d1939dd2bbee001e2b8;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 756d7d58c3c..caf8b2f22bf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,8 +19,15 @@ 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
 
@@ -32,7 +39,7 @@ ifeq ($(ENABLE_PIC),1)
 endif
 
 # No support for lto / gold on windows targets
-ifeq ($(OS), $(filter $(OS), Cygwin MingW))
+ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
   DIRS := $(filter-out lto gold, $(DIRS))
 endif