configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5cbbd7d858a7753c1cbe4ecbf9b9366f3f3bc897
Author: Kacper Kasper <kacperkas...@gmail.com>
AuthorDate: Wed Aug 1 19:09:48 2018 +0200
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed Aug 29 11:15:51 2018 +0200
Fix stack protector check
* "return 0;" is not enough to trigger it.
Change-Id: I5a011f664aec30096cd5d26a1f94a0405297b1db
Reviewed-on: https://gerrit.libreoffice.org/58437
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 4ab159b4146a..a96f968581b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5923,7 +5923,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; return 0; ]])],[
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
CFLAGS=$save_CFLAGS
if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
AC_MSG_RESULT([yes])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
