X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=9d2e576dfbdcbb149269d6a2a310c3ffaa704dea;hb=a4e4ffd389497eb28f5fe91521fb71da4340e5d6;hp=471cdd0c2de90af28fc3e821df26ca912b1a9a9d;hpb=46dec953194a2b3c308ec94c19961aa822b9d402;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 471cdd0c2de..9d2e576dfbd 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,24 +15,43 @@ 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 \
+
+# libEnhancedDisassembly must be built ahead of llvm-mc
+# because llvm-mc links against libEnhancedDisassembly
+DIRS := llvm-config edis llvm-mc
+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 \
+                 bugpoint llvm-bcanalyzer llvm-stub \
+                 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
 
-# build lto project on Darwin or if PIC is enabled
-ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto
-else ($(ENABLE_PIC),1)
-PARALLEL_DIRS += lto
-ifdef BINUTILS_INCDIR
-PARALLEL_DIRS += gold
+# These libraries build as dynamic libraries (.dylib /.so), they can only be
+# built if ENABLE_PIC is set.
+ifeq ($(ENABLE_PIC),1)
+  # No support for dynamic libraries on windows targets.
+  ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+    # gold only builds if binutils is around.  It requires "lto" to build before
+    # it so it is added to DIRS.
+    ifdef BINUTILS_INCDIR
+      DIRS += lto gold
+    else
+      PARALLEL_DIRS += lto
+    endif
+  endif
 endif
+
+# Don't build edis if we explicitly disabled it.
+ifeq ($(DISABLE_EDIS),1)
+  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
 endif
 
 include $(LEVEL)/Makefile.common