File tree Expand file tree Collapse file tree 7 files changed +2
-76
lines changed Expand file tree Collapse file tree 7 files changed +2
-76
lines changed Original file line number Diff line number Diff line change @@ -95,7 +95,6 @@ set(CLANG_DEFAULT_LINKER "lld" CACHE STRING "")
95
95
96
96
if (WIN32 )
97
97
set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded" CACHE STRING "" )
98
- set (LLVM_USE_CRT_RELEASE "MT" CACHE STRING "" )
99
98
endif ()
100
99
101
100
# Set up RPATH for the target runtime/builtin libraries.
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ set(LLDB_ENABLE_CURSES OFF CACHE BOOL "")
30
30
set (LLDB_ENABLE_LIBEDIT OFF CACHE BOOL "" )
31
31
32
32
if (WIN32 )
33
- set (LLVM_USE_CRT_RELEASE "MT" CACHE STRING "" )
34
33
set (FUCHSIA_DISABLE_DRIVER_BUILD ON )
35
34
endif ()
36
35
Original file line number Diff line number Diff line change @@ -70,10 +70,6 @@ foreach(variable ${_FUCHSIA_BOOTSTRAP_PASSTHROUGH})
70
70
endif ()
71
71
endforeach ()
72
72
73
- if (WIN32 )
74
- set (LLVM_USE_CRT_RELEASE "MT" CACHE STRING "" )
75
- endif ()
76
-
77
73
set (CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "" )
78
74
set (CLANG_DEFAULT_LINKER lld CACHE STRING "" )
79
75
set (CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "" )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -470,7 +470,6 @@ endif()
470
470
option (LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON )
471
471
472
472
if ( MSVC )
473
- include (ChooseMSVCCRT )
474
473
475
474
# Add definitions that make MSVC much less annoying.
476
475
add_compile_definitions (
@@ -951,7 +950,7 @@ if(LLVM_USE_SANITIZER)
951
950
endif ()
952
951
# Prepare ASAN runtime if needed
953
952
if (LLVM_USE_SANITIZER MATCHES ".*Address.*" )
954
- if (${LLVM_USE_CRT_${uppercase_CMAKE_BUILD_TYPE}} MATCHES "^(MT|MTd )$" )
953
+ if (${CMAKE_MSVC_RUNTIME_LIBRARY} MATCHES "^(MultiThreaded|MultiThreadedDebug )$" )
955
954
append ("/wholearchive:clang_rt.asan-${arch} .lib /wholearchive:clang_rt.asan_cxx-${arch} .lib"
956
955
CMAKE_EXE_LINKER_FLAGS )
957
956
append ("/wholearchive:clang_rt.asan_dll_thunk-${arch} .lib"
Original file line number Diff line number Diff line change @@ -14,10 +14,7 @@ set(LLVM_PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@)
14
14
15
15
set (LLVM_BUILD_TYPE @CMAKE_BUILD_TYPE@ )
16
16
17
- set (LLVM_USE_CRT_DEBUG @LLVM_USE_CRT_DEBUG@ )
18
- set (LLVM_USE_CRT_MINSIZEREL @LLVM_USE_CRT_MINSIZEREL@ )
19
- set (LLVM_USE_CRT_RELEASE @LLVM_USE_CRT_RELEASE@ )
20
- set (LLVM_USE_CRT_RELWITHDEBINFO @LLVM_USE_CRT_RELWITHDEBINFO@ )
17
+ set (CMAKE_MSVC_RUNTIME_LIBRARY @CMAKE_MSVC_RUNTIME_LIBRARY@ )
21
18
22
19
set (LLVM_USE_SPLIT_DWARF @LLVM_USE_SPLIT_DWARF@ )
23
20
Original file line number Diff line number Diff line change @@ -777,12 +777,6 @@ enabled sub-projects. Nearly all of these variable names begin with
777
777
``LLVM_USE_SANITIZER `` contains ``Undefined ``. This can be used to override
778
778
the default set of UBSan flags.
779
779
780
- **LLVM_USE_CRT_{target} **:STRING
781
- On Windows, tells which version of the C runtime library (CRT) should be used.
782
- For example, -DLLVM_USE_CRT_RELEASE=MT would statically link the CRT into the
783
- LLVM tools and library. This is deprecated; use ``CMAKE_MSVC_RUNTIME_LIBRARY ``
784
- instead.
785
-
786
780
**LLVM_USE_INTEL_JITEVENTS **:BOOL
787
781
Enable building support for Intel JIT Events API. Defaults to OFF.
788
782
You can’t perform that action at this time.
0 commit comments