From a3723dfcba2ae088d1b40586810bd9b592edcb91 Mon Sep 17 00:00:00 2001 From: Don Hinton Date: Tue, 28 May 2019 06:38:16 +0000 Subject: [PATCH] Revert [test] Fix plugin tests This reverts r361790 (git commit fe5eaab2b5b4523886bd63aebcfea8cfce586fa1) It's causing buildbot breakage, so reverting while I investigate. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361793 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 11 ----------- cmake/modules/HandleLLVMOptions.cmake | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ca7b6da6dc..895f9ab7189 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,17 +672,6 @@ set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}") message(STATUS "LLVM host triple: ${LLVM_HOST_TRIPLE}") message(STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE}") -if(WIN32 OR CYGWIN) - if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB) - set(LLVM_ENABLE_PLUGINS_default ON) - else() - set(LLVM_ENABLE_PLUGINS_default OFF) - endif() -else() - set(LLVM_ENABLE_PLUGINS_default ON) -endif() -option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default}) - include(HandleLLVMOptions) # Verify that we can find a Python 2 interpreter. Python 3 is unsupported. diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index 8e7c93c9a93..cb9a01e1d39 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -912,6 +912,14 @@ if(LLVM_LINK_LLVM_DYLIB AND LLVM_EXPORT_SYMBOLS_FOR_PLUGINS) message(FATAL_ERROR "LLVM_LINK_LLVM_DYLIB not compatible with LLVM_EXPORT_SYMBOLS_FOR_PLUGINS") endif() +# Plugin support +# FIXME: Make this configurable. +if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB) + set(LLVM_ENABLE_PLUGINS ON) +else() + set(LLVM_ENABLE_PLUGINS OFF) +endif() + # By default we should enable LLVM_ENABLE_IDE only for multi-configuration # generators. This option disables optional build system features that make IDEs # less usable. -- 2.40.0