[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f851dd40543aff46e75c739120b41d7f1ae1160
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jan 20 16:06:59 2021 +0100
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jun 14 11:36:15 2021 +0200

    Avoid Clang -Werror,-Wunused-command-line-argument
    
    > [CXX] bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
    > clang-12: error: argument unused during compilation: '-fno-stack-clash-protection' [-Werror,-Wunused-command-line-argument]
    
    as seen e.g. on macOS 11.1 ARM64 when building against Clang 12 trunk.  Clang
    supports -fstack-clash-protection on
    
    > $ clang --target=x86_64-unknown-linux-gnu -fstack-clash-protection -fsyntax-only -x c - </dev/null
    
    but not on e.g.
    
    > $ clang --target=aarch64-unknown-linux-gnu -fstack-clash-protection -fsyntax-only -x c - </dev/null
    > clang-12: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument]
    
    or
    
    > $ clang --target=arm64-apple-macosx11.0.0 -fstack-clash-protection -fsyntax-only -x c - </dev/null
    > clang-12: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument]
    
    Change-Id: I98625bb7ed37bf00e97634c1c8d1f87fe3263af9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109719
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117134
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/configure.ac b/configure.ac
index ff5da434d774..da6038d5a952 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6847,7 +6847,7 @@ HAVE_GCC_STACK_CLASH_PROTECTION=
 if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
     AC_MSG_CHECKING([whether $CC_BASE supports -fstack-clash-protection])
     save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -fstack-clash-protection"
+    CFLAGS="$CFLAGS -Werror -fstack-clash-protection"
     AC_LINK_IFELSE(
         [AC_LANG_PROGRAM(, [[return 0;]])],
         [AC_MSG_RESULT([yes]); HAVE_GCC_STACK_CLASH_PROTECTION=TRUE],