X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=8205568c2f5828beca3e4321021f144037efb036;hb=22ff748712b348300e51248339b6e8cf9b59e2c6;hp=c9b9ff231a6d8bec9a95a0221ecd2c6684e9b4f0;hpb=b788b3753bc9c73f6890fc89a409ddb59e477bb9;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index c9b9ff231a6..8205568c2f5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,8 +21,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llvm-ld llvm-prof llvm-link \
                  lli llvm-extract \
                  bugpoint llvm-bcanalyzer llvm-stub \
-                 llvm-mc llvmc \
-                 edis
+                 llvm-mc llvmc
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
@@ -32,16 +31,31 @@ endif
 
 include $(LEVEL)/Makefile.config
 
+# These libraries build as dynamic libraries (.dylib /.so), they can only be
+# built if ENABLE_PIC is set.
 ifeq ($(ENABLE_PIC),1)
-  DIRS += lto
-  ifdef BINUTILS_INCDIR
-    DIRS += gold
+  # No support for dynamic libraries on windows targets.
+  ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+    DIRS += edis
+
+    # 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
 
-# No support for lto / gold on windows targets
-ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
-  DIRS := $(filter-out lto gold, $(DIRS))
+# Only build edis if X86 target support is enabled.
+ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
+  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+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