From 2e89d20ad3ad29b420a92290bb7f5b9865c66bf0 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 5 Mar 2010 00:59:18 +0000
Subject: [PATCH] Only build libedis if ENABLE_SHARED is specified, just like
 liblto. Don't build any of the dynamic library stuff on cygwin/mingw.

llvm-svn: 97771
---
 llvm/tools/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile
index 2db84c6422f7..64179fd706a2 100644
--- a/llvm/tools/Makefile
+++ b/llvm/tools/Makefile
@@ -21,8 +21,8 @@ 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,18 +32,19 @@ 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)
-  PARALLEL_DIRS += lto
-  ifdef BINUTILS_INCDIR
-    PARALLEL_DIRS += gold
+  # No support for dynamic libraries on windows targets.
+  ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+    PARALLEL_DIRS += lto edis
+    # gold only builds if binutils is around.
+    ifdef BINUTILS_INCDIR
+      PARALLEL_DIRS += gold
+    endif
   endif
 endif
 
-# No support for lto / gold on windows targets
-ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
-  PARALLEL_DIRS := $(filter-out lto gold, $(DIRS))
-endif
-
 # Only build edis if X86 target support is enabled.
 ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
   PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))