summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/Config-kernel.in2
-rw-r--r--toolchain/gcc/Config.in5
2 files changed, 5 insertions, 2 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f4ea6ccbe8..feabf0870e 100644
--- 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 85abbdabb7..fd98914075 100644
--- 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