configure.ac | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
New commits: commit a24b48577df4782e8428bbaddbd7692e15c8f3ad Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Jan 20 09:37:08 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Dec 2 09:47:36 2025 +0100 _FORTIFY_SOURCE has a meaning only in glibc Change-Id: Ia087324841e4019d414d5ae3c845e80c7a7d1b73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194566 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/configure.ac b/configure.ac index 88f983a1423d..299004028d03 100644 --- a/configure.ac +++ b/configure.ac @@ -7810,17 +7810,19 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then [AC_MSG_RESULT([no])]) CFLAGS=$save_CFLAGS - AC_MSG_CHECKING([whether $CC_BASE supports -D_FORTIFY_SOURCE=2]) - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2" - if test "$ENABLE_OPTIMIZED" = TRUE; then - CFLAGS="$CFLAGS -O2" + if test "$_os" = "Linux"; then + AC_MSG_CHECKING([whether $CC_BASE supports -D_FORTIFY_SOURCE=2]) + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2" + if test "$ENABLE_OPTIMIZED" = TRUE; then + CFLAGS="$CFLAGS -O2" + fi + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include <string.h>]], [[return 0;]])], + [AC_MSG_RESULT([yes]); HARDENING_OPT_CFLAGS="$HARDENING_OPT_CFLAGS -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"], + [AC_MSG_RESULT([no])]) + CFLAGS=$save_CFLAGS fi - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include <string.h>]], [[return 0;]])], - [AC_MSG_RESULT([yes]); HARDENING_OPT_CFLAGS="$HARDENING_OPT_CFLAGS -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"], - [AC_MSG_RESULT([no])]) - CFLAGS=$save_CFLAGS AC_MSG_CHECKING([whether $CC_BASE supports -D_GLIBCXX_ASSERTIONS]) save_CFLAGS=$CFLAGS
