aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/modules/HandleLLVMOptions.cmake13
-rw-r--r--docs/CMake.rst5
3 files changed, 0 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a8eb98..e6fd506 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,6 @@ set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
-option(LLVM_STATIC_MSVC_RUNTIME "When using MSVC, link against the static run-time (/MT)" OFF)
-
option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON)
if ( LLVM_USE_FOLDERS )
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index 9fdc708..bb41a58 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -5,7 +5,6 @@
include(AddLLVMDefinitions)
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
-include(LLVMProcessSources)
if( CMAKE_COMPILER_IS_GNUCXX )
set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
@@ -41,18 +40,6 @@ else()
endif()
endif()
-if(MSVC AND LLVM_STATIC_MSVC_RUNTIME)
- # Link against the static runtime.
- foreach(flag CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
- CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE
- CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_MINSIZEREL)
- llvm_replace_compiler_option("${flag}" "/MD" "/MT")
- endforeach()
- foreach(flag CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG)
- llvm_replace_compiler_option("${flag}" "/MDd" "/MTd")
- endforeach()
-endif()
-
if(WIN32)
if(CYGWIN)
set(LLVM_ON_WIN32 0)
diff --git a/docs/CMake.rst b/docs/CMake.rst
index 69eeaab..c9fe538 100644
--- a/docs/CMake.rst
+++ b/docs/CMake.rst
@@ -280,11 +280,6 @@ LLVM-specific variables
are ``Address``, ``Memory`` and ``MemoryWithOrigins``. Defaults to empty
string.
-**LLVM_STATIC_MSVC_RUNTIME**:BOOL
- When building with MSVC, link against the static runtime library (/MT or /MTd
- for release and debug builds, respectively) instead of the dynamic one.
- Defaults to OFF.
-
Executing the test suite
========================