From e3a39d40db3893be37107356f0c1680bef8a8ec1 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 9 Apr 2010 20:51:47 +0000 Subject: [PATCH] suck the propagating "has dynamic libs" check into a single makefile variable TARGET_HAS_DYNAMIC_LIBS git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100896 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.config.in | 6 ++++++ lib/Transforms/Makefile | 4 ++-- runtime/Makefile | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 1b61f0908a8..7c59e5f3f42 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -321,6 +321,12 @@ 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 ($(TARGET_OS), $(filter $(TARGET_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 e527be25dec..648d10f7b0b 100644 --- a/lib/Transforms/Makefile +++ b/lib/Transforms/Makefile @@ -12,8 +12,8 @@ PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Hello include $(LEVEL)/Makefile.config -# No support for plugins on windows targets -ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW Minix)) +# Some targets don't support plugins +ifdef $(TARGET_HAS_DYNAMIC_LIBS) PARALLEL_DIRS := $(filter-out Hello, $(PARALLEL_DIRS)) endif diff --git a/runtime/Makefile b/runtime/Makefile index d0e85d58264..741d87bc652 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -20,7 +20,7 @@ ifeq ($(ARCH), Sparc) PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS)) endif -ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW Minix)) +ifdef $(TARGET_HAS_DYNAMIC_LIBS) PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS)) endif -- 2.34.1