From: Ali Maredia <amaredia@redhat.com>
Date: Fri, 17 Jun 2016 19:31:45 +0000 (-0400)
Subject: cmake: eliminate FORTIFY_SOURCE warnings
X-Git-Tag: v11.0.0~88^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6f3e3cf63445fe974c7efd05028448edc06d9652;p=ceph-ci.git

cmake: eliminate FORTIFY_SOURCE warnings

"-werr" was added to CHECK_C_COMPILER_FLAG to
make sure FORTIFY_SOURCE is only turned on if
the flag generates no warnings.

Added "-U_FORTIFY_SOURCE" to CMAKE_C_FLAGS to
mimic PR #9761.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab0b2fdfb6f..0e8809fcd97 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,11 +22,9 @@ set(CMAKE_ASM_FLAGS "-f elf64")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -rdynamic -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -Werror=format-security -fno-strict-aliasing -fsigned-char -fPIC")
 
 include(CheckCCompilerFlag)
-CHECK_C_COMPILER_FLAG("-Wp,-D_FORTIFY_SOURCE=2" HAS_FORTIFY_SOURCE)
-if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+CHECK_C_COMPILER_FLAG("-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2 -Werror" HAS_FORTIFY_SOURCE)
 if(HAS_FORTIFY_SOURCE)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
-endif()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2")
 endif()
 CHECK_C_COMPILER_FLAG(-fstack-protector-strong HAS_STACK_PROTECT)
 if (HAS_STACK_PROTECT)