Revert r100896 and around - this breaks the only mingw32 buildbot we have.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101387 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index d88ec4a287cac9cbbe88fbf9a793d1285616d3f4..1b61f0908a8cefb8cc06bafd2e17ad3d5ff62d01 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -321,12 +321,6 @@ CXX_INCLUDE_ARCH := @CXX_INCLUDE_ARCH@
 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).

diff --git a/lib/Transforms/Makefile b/lib/Transforms/Makefile
index 648d10f7b0bf32aa12bd28f6c7a9a9212f3d8247..e527be25decb1f32cfa7b089eca8d1ceb06ef536 100644 (file)
--- a/lib/Transforms/Makefile
+++ b/lib/Transforms/Makefile
@@ -12,8 +12,8 @@ PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Hello
 
 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
 

diff --git a/runtime/Makefile b/runtime/Makefile
index 741d87bc6525f26260a105ce2d0b173b34e87ac0..d0e85d58264f6c9fb034565ac58bb7e781e8f030 100644 (file)
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -20,7 +20,7 @@ ifeq ($(ARCH), Sparc)
 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