From 5252d19fbaa5c504dd6502f01736afa8fe62c068 Mon Sep 17 00:00:00 2001 From: Charles Davis Date: Tue, 22 Sep 2015 15:57:00 -0600 Subject: [PATCH] configure: Try harder to disable Fortify. Signed-off-by: Charles Davis --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 33f034352a1..b4bbb2f22fe 100755 --- a/configure +++ b/configure @@ -14550,7 +14550,7 @@ else int main () { -#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) #error Fortify enabled #endif ; diff --git a/configure.ac b/configure.ac index 74ab2026e35..ce631e4dbb1 100644 --- a/configure.ac +++ b/configure.ac @@ -1898,7 +1898,7 @@ dnl **** Disable Fortify, it has too many false positives AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], -[[#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +[[#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) #error Fortify enabled #endif]])], [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes]))