[llvm-commits] [llvm] r101387 - in /llvm/trunk: Makefile.config.in lib/Transforms/Makefile runtime/Makefile

[Anton Korobeynikov]

Author: asl
Date: Thu Apr 15 14:51:42 2010
New Revision: 101387

URL: http://llvm.org/viewvc/llvm-project?rev=101387&view=rev
Log:
Revert r100896 and around - this breaks the only mingw32 buildbot we have.

Modified:
    llvm/trunk/Makefile.config.in
    llvm/trunk/lib/Transforms/Makefile
    llvm/trunk/runtime/Makefile

Modified: llvm/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=101387&r1=101386&r2=101387&view=diff
==============================================================================
--- llvm/trunk/Makefile.config.in (original)
+++ llvm/trunk/Makefile.config.in Thu Apr 15 14:51:42 2010
@@ -321,12 +321,6 @@
 CXX_INCLUDE_32BIT_DIR = @CXX_INCLUDE_32BIT_DIR@
 CXX_INCLUDE_64BIT_DIR = @CXX_INCLUDE_64BIT_DIR@
 
-# TARGET_HAS_DYNAMIC_LIBS - This is set if the target supports dynamic linking
-# .dylib or .so files.
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW Minix))
-TARGET_HAS_DYNAMIC_LIBS := 1
-endif
-
 # When ENABLE_LLVMC_DYNAMIC is enabled, LLVMC will link libCompilerDriver
 # dynamically. This is needed to make dynamic plugins work on some targets
 # (Windows).

Modified: llvm/trunk/lib/Transforms/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Makefile?rev=101387&r1=101386&r2=101387&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Makefile (original)
+++ llvm/trunk/lib/Transforms/Makefile Thu Apr 15 14:51:42 2010
@@ -12,8 +12,8 @@
 
 include $(LEVEL)/Makefile.config
 
-# Some targets don't support plugins
-ifdef $(TARGET_HAS_DYNAMIC_LIBS)
+# No support for plugins on windows targets
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW Minix))
   PARALLEL_DIRS := $(filter-out Hello, $(PARALLEL_DIRS))
 endif
 

Modified: llvm/trunk/runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtime/Makefile?rev=101387&r1=101386&r2=101387&view=diff
==============================================================================
--- llvm/trunk/runtime/Makefile (original)
+++ llvm/trunk/runtime/Makefile Thu Apr 15 14:51:42 2010
@@ -20,7 +20,7 @@
 PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS))
 endif
 
-ifdef $(TARGET_HAS_DYNAMIC_LIBS)
+ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW Minix))
 PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS))
 endif