Patchwork [PULL,01/15] configure: Undefine _FORTIFY_SOURCE prior using it

login
register
mail settings
Submitter Michael Tokarev
Date Sept. 14, 2013, 7:47 p.m.
Message ID <1379188061-7634-2-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/274939/
State New
Headers show

Comments

Michael Tokarev - Sept. 14, 2013, 7:47 p.m.
From: Michal Privoznik <mprivozn@redhat.com>

Currently, we are enforcing the _FORTIFY_SOURCE=2 without any
previous detection if the macro has been already defined, e.g.
by environment, or is just enabled by compiler by default.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/configure b/configure
index 2b83936..21451ba 100755
--- a/configure
+++ b/configure
@@ -3502,7 +3502,7 @@  if test "$gcov" = "yes" ; then
   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
 elif test "$debug" = "no" ; then
-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
+  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
 fi