config: select KERNEL_WERROR if building with default GCC 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>

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f4ea6ccbe809d16af457ffcd963c9a02aa066a36..feabf0870e50c7a95164fca3fa5f2c48506c7987 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1418,8 +1418,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 85abbdabb7ac54d544b3e5d79c37d310860e679f..fd98914075524cdb4e6fd3b479bc30e120d9eb66 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_13
+       imply KERNEL_WERROR
+
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS