diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-09-30 16:32:51 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-09-30 16:32:51 +0000 |
commit | 4b5205d2a3e0df909f29de0bff8ea775ad21fe0f (patch) | |
tree | aa3c07ca616abe728795bd407448e6f5ecf1bc0e /tools | |
parent | 9724873c317d2b170cfea87cdf2a402fcd7c6c7d (diff) | |
download | external_llvm-4b5205d2a3e0df909f29de0bff8ea775ad21fe0f.zip external_llvm-4b5205d2a3e0df909f29de0bff8ea775ad21fe0f.tar.gz external_llvm-4b5205d2a3e0df909f29de0bff8ea775ad21fe0f.tar.bz2 |
Revert "Enable building LTO on WIN32."
This reverts commit r191670.
It was causing build failures on the msvc bots:
http://bb.pgr.jp/builders/ninja-clang-i686-msc17-R/builds/5166/steps/compile/logs/stdio
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191679 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tools/lto/CMakeLists.txt | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index d8001e7..468d396 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -43,7 +43,7 @@ add_llvm_tool_subdirectory(llvm-symbolizer) add_llvm_tool_subdirectory(obj2yaml) add_llvm_tool_subdirectory(yaml2obj) -if( NOT CYGWIN ) +if( NOT WIN32 ) add_llvm_tool_subdirectory(lto) add_llvm_tool_subdirectory(llvm-lto) else() diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt index 5e5d8ad..8b26ddd 100644 --- a/tools/lto/CMakeLists.txt +++ b/tools/lto/CMakeLists.txt @@ -9,19 +9,7 @@ set(SOURCES lto.cpp ) -if( NOT CYGWIN AND LLVM_ENABLE_PIC ) - if ( WIN32 ) - # Create .def file containing a list of exports preceeded by - # 'EXPORTS'. The file "lto.exports" already contains the list, so we - # massage it into the correct format here to create "lto.exports.def". - set(LTO_EXPORTS_DEF ${CMAKE_CURRENT_BINARY_DIR}/lto.exports.def) - file(READ "lto.exports" exports_list) - file(WRITE ${LTO_EXPORTS_DEF} "LIBRARY LTO\n") - file(APPEND ${LTO_EXPORTS_DEF} "EXPORTS\n") - file(APPEND ${LTO_EXPORTS_DEF} ${exports_list}) - set(SOURCES ${SOURCES} ${LTO_EXPORTS_DEF}) - endif() - +if( NOT WIN32 AND LLVM_ENABLE_PIC ) set(bsl ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS ON) add_llvm_library(LTO ${SOURCES}) @@ -37,7 +25,7 @@ if( NOT BUILD_SHARED_LIBS ) set_property(TARGET ${LTO_STATIC_TARGET_NAME} PROPERTY OUTPUT_NAME "LTO") endif() -if( NOT CYGWIN ) +if( NOT WIN32 ) install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h DESTINATION include/llvm-c) endif() |