summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug18841.17
-rw-r--r--configure.ac2
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug18841.1 b/changes/bug18841.1
new file mode 100644
index 0000000000..205ee5a425
--- /dev/null
+++ b/changes/bug18841.1
@@ -0,0 +1,7 @@
+ o Major bugfixes (compilation):
+ - Correctly detect compiler flags on systems where _FORTIFY_SOURCE
+ is predefined. Previously, our use of -D_FORTIFY_SOURCE would
+ cause a compiler warning, thereby making other checks fail.
+ Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from
+ "trudokal".
+
diff --git a/configure.ac b/configure.ac
index e4816fdbd7..a487948745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,7 +761,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
#endif])], have_clang=yes, have_clang=no)
if test "x$enable_gcc_hardening" != "xno"; then
- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+ CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
if test "x$have_clang" = "xyes"; then
TOR_CHECK_CFLAGS(-Qunused-arguments)
fi