commit e600cdf3b4ffe3370eb10a8e43ed547ac0f716cf
author Michal Privoznik <mprivozn@redhat.com> Thu Sep 05 12:54:49 2013 +0200
committer Michael Tokarev <mjt@tls.msk.ru> Fri Sep 20 20:09:23 2013 +0400
tree 65e62523565f2d887a45e5b0ecee46a87b2080b4
parent 6c2679fc19560699679200fb42ab4659bcbe7f79

configure: Undefine _FORTIFY_SOURCE prior using it

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

diff --git a/configure b/configure
index 1b6f68b..8ad42bc 100755
--- a/configure
+++ b/configure
@@ -3520,7 +3520,7 @@
   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