diff options
| author | Anton Korobeynikov <asl@math.spbu.ru> | 2010-04-15 19:51:42 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <asl@math.spbu.ru> | 2010-04-15 19:51:42 +0000 |
| commit | 839cdaa70a2f4c36df0441bb7c467efeaa6f157b (patch) | |
| tree | 1cf89f8316ebde68601edd47c7242c5cc8b5e9e2 | |
| parent | b36d07cb930b1424f99f03c1c9976de011ce2617 (diff) | |
| download | bcm5719-llvm-839cdaa70a2f4c36df0441bb7c467efeaa6f157b.tar.gz bcm5719-llvm-839cdaa70a2f4c36df0441bb7c467efeaa6f157b.zip | |
Revert r100896 and around - this breaks the only mingw32 buildbot we have.
llvm-svn: 101387
| -rw-r--r-- | llvm/Makefile.config.in | 6 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Makefile | 4 | ||||
| -rw-r--r-- | llvm/runtime/Makefile | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/llvm/Makefile.config.in b/llvm/Makefile.config.in index d88ec4a287c..1b61f0908a8 100644 --- a/llvm/Makefile.config.in +++ b/llvm/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/llvm/lib/Transforms/Makefile b/llvm/lib/Transforms/Makefile index 648d10f7b0b..e527be25dec 100644 --- a/llvm/lib/Transforms/Makefile +++ b/llvm/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/llvm/runtime/Makefile b/llvm/runtime/Makefile index 741d87bc652..d0e85d58264 100644 --- a/llvm/runtime/Makefile +++ b/llvm/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 |
