6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-14 16:33:28 +00:00
Code Issues Projects Releases Wiki Activity

Revert my CMake patches concerning building with /MT (r194589, r194596)

Browse Source 
Reid pointed out we already have LLVM_USE_CRT_{buildtype} to set it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194604 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg 2013-11-13 20:29:10 +00:00
parent dc9a217d05
commit 7adae8e795
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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_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) option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON)
if ( LLVM_USE_FOLDERS ) if ( LLVM_USE_FOLDERS )
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)

13
cmake/modules/HandleLLVMOptions.cmake
View File

@ -5,7 +5,6 @@
include(AddLLVMDefinitions) include(AddLLVMDefinitions)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(LLVMProcessSources)
if( CMAKE_COMPILER_IS_GNUCXX ) if( CMAKE_COMPILER_IS_GNUCXX )
set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON) set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
@ -41,18 +40,6 @@ else()
endif() endif()
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(WIN32)
if(CYGWIN) if(CYGWIN)
set(LLVM_ON_WIN32 0) set(LLVM_ON_WIN32 0)

5
docs/CMake.rst
View File

@ -280,11 +280,6 @@ LLVM-specific variables
are ``Address``, ``Memory`` and ``MemoryWithOrigins``. Defaults to empty are ``Address``, ``Memory`` and ``MemoryWithOrigins``. Defaults to empty
string. 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 Executing the test suite
======================== ========================