[tor-commits] [tor/master] Better workaround for CFLAGS issues from #14072; fixes #14162

[nickm at torproject.org]

commit dc25fb7382b5cb930aaf0cdc842490ff5c11233e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jan 10 17:21:11 2015 -0500

    Better workaround for CFLAGS issues from #14072; fixes #14162
    
    When I applied patch fcc78e5f8a3249eadfea31db, I somehow broke
    stack trace symbols on Linux.  I'll leave it to others to figure out
    why that happens.  This should be better.  Really.
    
    Fixes bug 14162; bug not in any released version of Tor.
---
 Makefile.am  |    1 +
 configure.ac |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f105464..67c9cc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ noinst_PROGRAMS=
 DISTCLEANFILES=
 bin_SCRIPTS=
 AM_CPPFLAGS=
+AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@
 include src/include.am
 include doc/include.am
 include contrib/include.am
diff --git a/configure.ac b/configure.ac
index 2c92a6c..1fd5960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,9 +130,10 @@ fi
 
 if test x$have_systemd = xyes; then
     AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd])
-    CFLAGS="${CFLAGS} ${SYSTEMD_CFLAGS}"
+    TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}"
     TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}"
 fi
+AC_SUBST(TOR_SYSTEMD_CFLAGS)
 AC_SUBST(TOR_SYSTEMD_LIBS)
 
 if test x$enable_systemd = xyes -a x$have_systemd != xyes ; then
@@ -1543,7 +1544,7 @@ fi
 if test "$GCC" = yes; then
   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
   # accident waiting to happen.
-  CFLAGS="$CFLAGS -Wall -fno-strict-aliasing -g -O2"
+  CFLAGS="$CFLAGS -Wall -fno-strict-aliasing"
 else
   # Override optimization level for non-gcc compilers
   CFLAGS="$CFLAGS -O"