From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 10 Feb 2012 19:28:10 +0000 (-0500)
Subject: Don't permanently add -D_FORTIFY_SOURCE=2 to CPPFLAGS
X-Git-Tag: SUDO_1_8_4~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=054e448081a71ab9f790394609d83b832e34d584;p=sudo

Don't permanently add -D_FORTIFY_SOURCE=2 to CPPFLAGS
---

diff --git a/configure b/configure
index 0b8e31121..d6a578a49 100755
--- a/configure
+++ b/configure
@@ -16376,7 +16376,8 @@ done
 fi
 done
 
-O_CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+O_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
 ac_fn_c_check_func "$LINENO" "__sprintf_chk" "ac_cv_func___sprintf_chk"
 if test "x$ac_cv_func___sprintf_chk" = xyes; then :
 
diff --git a/configure.in b/configure.in
index a3eaad998..5893b7da6 100644
--- a/configure.in
+++ b/configure.in
@@ -2089,7 +2089,8 @@ AC_CHECK_FUNCS(getline, [], [
 dnl
 dnl If libc supports _FORTIFY_SOURCE check functions, use it.
 dnl
-O_CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+O_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
 AC_CHECK_FUNC(__sprintf_chk, [
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[char buf[4]; (void)sprintf(buf, "%s", "foo");]])], [OSDEFS="${OSDEFS} -D_FORTIFY_SOURCE=2"], [])
 ], [])