Fixed slow MSAN debug build

SChernykh · Mar 4, 2025 · 1a3ce76 · 1a3ce76
1 parent d006ac2
commit 1a3ce76
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -432,9 +432,8 @@ else()
 endif()
 
 message(STATUS "Summary of build options:
-    C compiler:       ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
-    CXX compiler:     ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
-    C_FLAGS:          ${CMAKE_C_FLAGS}
-    CXX_FLAGS:        ${CMAKE_CXX_FLAGS}
-    CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}
+    C compiler:         ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
+    CXX compiler:       ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
+    C_FLAGS:            ${CMAKE_C_FLAGS}
+    CXX_FLAGS:          ${CMAKE_CXX_FLAGS}
 ")
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
@@ -47,15 +47,17 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -fno-associative-math")
 	endif()
 
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${OPTIMIZATION_FLAGS}")
-
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${OPTIMIZATION_FLAGS}")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG "")
+	set(CMAKE_C_FLAGS_RELEASE "")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_C_FLAGS_MINSIZEREL "")
+
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "")
+	set(CMAKE_CXX_FLAGS_RELEASE "")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "")
 
 	if (WIN32)
 		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
@@ -129,13 +131,15 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -flto")
 	endif()
 
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${OPTIMIZATION_FLAGS}")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG "")
+	set(CMAKE_C_FLAGS_RELEASE "")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_C_FLAGS_MINSIZEREL "")
 
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${OPTIMIZATION_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${OPTIMIZATION_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "")
+	set(CMAKE_CXX_FLAGS_RELEASE "")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "")
 endif()