From 52a1b5a8c23ebd068172c3c18a4f11c690fd1a2c Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@askmonty.org>
Date: Wed, 11 Mar 2015 13:05:03 +0400
Subject: [PATCH] MY_CHECK_AND_SET_COMPILER_FLAG changes

* watch for "redefined macro" warning
* don't enable -D_FORTIFY_SOURCE=2 in debug builds (it requires -O)
---
 CMakeLists.txt                  | 8 +-------
 cmake/check_compiler_flag.cmake | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ca49a9ee4b..48015fa29d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,13 +206,7 @@ IF(SECURITY_HARDENED)
   MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
   MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now")
   MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")
-
-  # sometimes _FORTIFY_SOURCE is predefined
-  INCLUDE(CheckSymbolExists)
-  CHECK_SYMBOL_EXISTS(_FORTIFY_SOURCE "" HAVE_FORTIFY_SOURCE)
-  IF(NOT HAVE_FORTIFY_SOURCE)
-    ADD_DEFINITIONS(-D_FORTIFY_SOURCE=2)
-  ENDIF()
+  MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
 ENDIF()
 
 OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) 
diff --git a/cmake/check_compiler_flag.cmake b/cmake/check_compiler_flag.cmake
index 25e4af23dd9..8eb6ed2176e 100644
--- a/cmake/check_compiler_flag.cmake
+++ b/cmake/check_compiler_flag.cmake
@@ -9,6 +9,7 @@ SET(fail_patterns
     FAIL_REGEX "unrecognized .*option"
     FAIL_REGEX "ignoring unknown option"
     FAIL_REGEX "warning:.*ignored"
+    FAIL_REGEX "warning:.*redefined"
     FAIL_REGEX "[Ww]arning: [Oo]ption"
     )