From 9f4dfcb795bb0ecf9944553f49371164801cd83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 17 Jul 2023 11:16:05 +0300 Subject: [CMake] Clean up old code for handling MSVC runtime setting the old way This was left in place to reduce the risk of breaking anything, and to keep the diff smaller, in D155233. Differential Revision: https://reviews.llvm.org/D155431 --- compiler-rt/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'compiler-rt') diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index fd0430e..1545340 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -389,17 +389,6 @@ endif() if(MSVC) # FIXME: In fact, sanitizers should support both /MT and /MD, see PR20214. set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded) - # Remove any /M[DT][d] flags, and strip any definitions of _DEBUG. - # TODO: We probably could remove this altogether. - foreach(flag_var - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE - CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - string(REGEX REPLACE "[/-]M[DT]d" "" ${flag_var} "${${flag_var}}") - string(REGEX REPLACE "[/-]MD" "" ${flag_var} "${${flag_var}}") - string(REGEX REPLACE "[/-]D_DEBUG" "" ${flag_var} "${${flag_var}}") - endforeach() append_list_if(COMPILER_RT_HAS_Oy_FLAG /Oy- SANITIZER_COMMON_CFLAGS) append_list_if(COMPILER_RT_HAS_GS_FLAG /GS- SANITIZER_COMMON_CFLAGS) -- cgit v1.1