From 37dfcad927e8126a51e632017b0f504d22a2ceb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?= Date: Sun, 17 Jan 2021 08:15:19 +0100 Subject: [PATCH] Hide warnings from GCC if compiling with LTO This adds the change from d643edc (in scons) and 941433e (in cmake) to the linking step as well, but only when using LTO closes #5350 --- CMakeLists.txt | 2 +- SConstruct | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3978ed30a5..10514f0a0d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,7 +382,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto=${LTO_JOBS}" CACHE STRING "Release build flags with LTO" FORCE) MESSAGE("Using GCC gold linker") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -fuse-ld=gold" CACHE STRING "" FORCE) + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -fuse-ld=gold -Wno-stringop-overflow" CACHE STRING "" FORCE) endif(ENABLE_LTO) endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/SConstruct b/SConstruct index 732cf99f094..79782fe85b6 100755 --- a/SConstruct +++ b/SConstruct @@ -591,7 +591,7 @@ for env in [test_env, client_env, env]: if env["enable_lto"] == True: rel_comp_flags = rel_comp_flags + " -flto=" + str(env["jobs"]) - rel_link_flags = rel_comp_flags + " -fuse-ld=gold" + rel_link_flags = rel_comp_flags + " -fuse-ld=gold -Wno-stringop-overflow" elif "clang" in env["CXX"]: if env["pgo_data"] == "generate": rel_comp_flags = rel_comp_flags + " -fprofile-instr-generate=pgo_data/wesnoth-%p.profraw"