[llvm-commits] [llvm] r97771 - /llvm/trunk/tools/Makefile

[Chris Lattner]

Author: lattner
Date: Thu Mar  4 18:59:18 2010
New Revision: 97771

URL: http://llvm.org/viewvc/llvm-project?rev=97771&view=rev
Log:
Only build libedis if ENABLE_SHARED is specified, just like liblto.
Don't build any of the dynamic library stuff on cygwin/mingw.


Modified:
    llvm/trunk/tools/Makefile

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=97771&r1=97770&r2=97771&view=diff
==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Thu Mar  4 18:59:18 2010
@@ -21,8 +21,8 @@
                  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 @@
 
 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))