config: select KERNEL_WERROR if building with default GCC version

[ during cherry-pick GCC version was changed to default GCC 12 version ]

At the moment we have to manually follow the default GCC version
also in config/Config-kernel.in. This tends to be forgotten at GCC
version bumps (just happened when switching from version 12 to 13).
Instead, introduce a hidden Kconfig symbol which implies KERNEL_WERROR
in toolchain/gcc/Config.in where it is visible for developers changing
the default version.

Also remove the explicit default on BUILDBOT to avoid a circular
dependency and also because buildbots anyway implicitly always select
the default GCC version.

Reference: https://github.com/openwrt/openwrt/pull/15064
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [GCC 12 default]
(cherry picked from commit 501ef81040baa2ee31de6dd9f75d619de0e4c9bc)

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index bbda247cd76daa3d73b06b0435d19df0e0a01104..42755a4d59f3495bff763a7c1d582f60192f69eb 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1343,8 +1343,6 @@ config KERNEL_JFFS2_FS_SECURITY
 
 config KERNEL_WERROR
        bool "Compile the kernel with warnings as errors"
-       default BUILDBOT
-       default y if GCC_USE_VERSION_12
        help
          A kernel build should not cause any compiler warnings, and this
          enables the '-Werror' (for C) and '-Dwarnings' (for Rust) flags

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9156f9c26356848f598e423429f1af6fe1930dc1..be975e533469bda154d95e9162e3906b0c34f661 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -16,6 +16,11 @@ choice
                bool "gcc 13.x"
 endchoice
 
+config GCC_USE_DEFAULT_VERSION
+       bool
+       default y if !TOOLCHAINOPTS || GCC_USE_VERSION_12
+       imply KERNEL_WERROR
+
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS