Remove use of exceptions from bugpoint. No deliberate functionality change!

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 58130570d7aace5622698521406f6be43f80524e..8205568c2f5828beca3e4321021f144037efb036 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,7 +22,6 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  lli llvm-extract \
                  bugpoint llvm-bcanalyzer llvm-stub \
                  llvm-mc llvmc
-                 
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
@@ -37,8 +36,8 @@ include $(LEVEL)/Makefile.config
 ifeq ($(ENABLE_PIC),1)
   # No support for dynamic libraries on windows targets.
   ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
-    PARALLEL_DIRS += edis
-    
+    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
@@ -54,4 +53,9 @@ 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