summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-05-08 22:36:38 +0000
committerLennart Poettering <lennart@poettering.net>2007-05-08 22:36:38 +0000
commitc878c09b354196a7814123016676bdaac7b9147a (patch)
tree1c00449e48abb697dc7604240ac2678f96f1b5e8
parent564b9dd0f1da53ee73e667618d5bb1d65b0c309f (diff)
Disable SSP on archs that don't support it. (Patch idead from Sjoerd Simons; Closes #137)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1462 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--common/gcc_stack_protect.m44
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 3 deletions
diff --git a/common/gcc_stack_protect.m4 b/common/gcc_stack_protect.m4
index 13c5e0a..2246849 100644
--- a/common/gcc_stack_protect.m4
+++ b/common/gcc_stack_protect.m4
@@ -57,7 +57,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[
AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector],
ssp_cv_cc,
[ssp_old_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -fstack-protector"
+ CFLAGS="$CFLAGS -fstack-protector -Werror"
AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
CFLAGS="$ssp_old_cflags"
])
@@ -74,7 +74,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CXX],[
AC_CACHE_CHECK([whether ${CXX} accepts -fstack-protector],
ssp_cv_cxx,
[ssp_old_cxxflags="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fstack-protector"
+ CXXFLAGS="$CXXFLAGS -fstack-protector -Werror"
AC_TRY_COMPILE(,, ssp_cv_cxx=yes, ssp_cv_cxx=no)
CXXFLAGS="$ssp_old_cxxflags"
])
diff --git a/configure.ac b/configure.ac
index 2286b80..cbfa2b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ if test x"$enable_ssp" = x"yes"; then
AC_MSG_CHECKING([whether stack-smashing protection is available])
ssp_old_cflags="$CFLAGS"
ssp_old_ldflags="$LDFLAGS"
- CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
+ CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
LDFLAGS="$LDFLAGS -Wl,-z,defs"
cat confdefs.h > conftest.c
cat >>conftest.c <<_ACEOF