configure.ac | 5 ++++- solenv/gbuild/platform/com_GCC_defs.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 0cf755adbb39591e9f6d273bfe5dce2469a86dbf Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Mon Apr 22 15:11:07 2024 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Mon Apr 22 20:44:23 2024 +0200 add undefining FORTIFY_SOURCE to the gcc no-opt flags We build non-optimized files by adding the no-opt flags to the compiler options that include the optimized flags, so add undefining FORTIFY_SOURCE to the -O0 line motivation here to have --enable-hardening-flags not add unhelpful extra warnings to the build for the parts built with -O0 Change-Id: Ib5416ad7f9f5ef907d7c767a5ebff6343b035cfe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166458 Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/configure.ac b/configure.ac index b1ace35b8d1f..4aa7b05bbbb5 100644 --- a/configure.ac +++ b/configure.ac @@ -7417,8 +7417,11 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; 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_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 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index a09ee850e96a..e3e84181664a 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -223,7 +223,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) gb_PrecompiledHeader_ignore_flags_for_flags_file := -Wunused-macros # optimization level -gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow +gb_COMPILERNOOPTFLAGS := -O0 -Wp,-U_FORTIFY_SOURCE -fstrict-aliasing -fstrict-overflow gb_COMPILERDEBUGOPTFLAGS := -Og ifeq ($(OS),ANDROID)