From 3ef98ff5f9e35732d1630db6d9a7948a9128e8c7 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 27 Jun 2014 02:51:21 +0000 Subject: [PATCH] Don't force the build of toos/lto as a static lib. Any uses of tools/lto as a static lib should probably move to lib/LTO. This was also never implemented in the configure build, so this reduces the differences among the two. llvm-svn: 211852 --- llvm/tools/CMakeLists.txt | 2 +- llvm/tools/lto/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt index 13b7f5a..846ad1e 100644 --- a/llvm/tools/CMakeLists.txt +++ b/llvm/tools/CMakeLists.txt @@ -49,7 +49,7 @@ add_llvm_tool_subdirectory(llvm-c-test) add_llvm_tool_subdirectory(obj2yaml) add_llvm_tool_subdirectory(yaml2obj) -if( NOT CYGWIN ) +if(NOT CYGWIN AND LLVM_ENABLE_PIC) add_llvm_tool_subdirectory(lto) add_llvm_tool_subdirectory(llvm-lto) else() diff --git a/llvm/tools/lto/CMakeLists.txt b/llvm/tools/lto/CMakeLists.txt index 542053b..71391b7 100644 --- a/llvm/tools/lto/CMakeLists.txt +++ b/llvm/tools/lto/CMakeLists.txt @@ -16,11 +16,7 @@ set(SOURCES set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) -if(NOT CYGWIN AND LLVM_ENABLE_PIC) - set(ENABLE_SHARED SHARED) -endif() - -add_llvm_library(LTO ${ENABLE_SHARED} STATIC ${SOURCES}) +add_llvm_library(LTO SHARED ${SOURCES}) install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h DESTINATION include/llvm-c) -- 2.7.4