From 90fedfadd937189abdcd1a57031ba87d9e8efbb7 Mon Sep 17 00:00:00 2001 From: "Andy I. Christianson" Date: Tue, 24 Oct 2017 16:27:40 -0400 Subject: [PATCH] MINIFICPP-265 Disabled fsanitize=address for now, due to overly-verbose log messages. This may be re-enabled in a more controlled fashion later on. --- CMakeLists.txt | 2 -- thirdparty/civetweb-1.9.1/CMakeLists.txt | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48416a8f39..324b9c9a5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,8 +50,6 @@ endif() set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -# Enable asan in DEBUG for compatibility with civet -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address") # Search for threads find_package(Threads REQUIRED) diff --git a/thirdparty/civetweb-1.9.1/CMakeLists.txt b/thirdparty/civetweb-1.9.1/CMakeLists.txt index 146f8e7acf..82012c4762 100644 --- a/thirdparty/civetweb-1.9.1/CMakeLists.txt +++ b/thirdparty/civetweb-1.9.1/CMakeLists.txt @@ -277,11 +277,6 @@ add_c_compiler_flag(-pedantic-errors) add_c_compiler_flag(-fvisibility=hidden) add_c_compiler_flag(-fstack-protector-strong RELEASE) add_c_compiler_flag(-flto RELEASE) -add_c_compiler_flag(-fsanitize=undefined DEBUG) -add_c_compiler_flag(-fsanitize=address DEBUG) -if (HAVE_C_FLAG_FSANITIZE_ADDRESS) - add_c_compiler_flag(-static-asan DEBUG) -endif() add_c_compiler_flag(-fstack-protector-all DEBUG) if (MINGW) add_c_compiler_flag(-mwindows) @@ -344,11 +339,6 @@ if (CIVETWEB_ENABLE_CXX) add_cxx_compiler_flag(-fvisibility=hidden) add_cxx_compiler_flag(-fstack-protector-strong RELEASE) add_cxx_compiler_flag(-flto RELEASE) - add_cxx_compiler_flag(-fsanitize=undefined DEBUG) - add_cxx_compiler_flag(-fsanitize=address DEBUG) - if (HAVE_CXX_FLAG_FSANITIZE_ADDRESS) - add_cxx_compiler_flag(-static-asan DEBUG) - endif() add_cxx_compiler_flag(-fstack-protector-all DEBUG) if (MINGW) add_cxx_compiler_flag(-mwindows)