config: fix CONFIG_GDB appearing in main menuconfig menu

I noticed that CONFIG_GDB was suddenly appearing in the main menuconfig menu despite the fact that it should be visible only when TOOLCHAINOPTS is selected and under a dedicated menu. After some trial and error, it seems that this was caused by the recent addition of GCC_USE_DEFAULT_VERSION, and after even more trial and error it gets fixed as soon GCC_USE_DEFAULT_VERSION is placed after GCC_VERSION. So, lets simply put GCC_USE_DEFAULT_VERSION after GCC_VERSION. Fixes: 501ef81 ("config: select KERNEL_WERROR if building with default GCC version") Signed-off-by: Robert Marko <[email protected]> Signed-off-by: Petr Štetiar <[email protected]> [rebased] (cherry picked from commit 12b2cb2)
lede-project · Apr 18, 2024 · e8cc17e · e8cc17e
1 parent 915dfbd
commit e8cc17e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
@@ -16,11 +16,6 @@ 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

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
@@ -11,3 +11,8 @@ config GCC_VERSION
 	default "11.3.0"	if GCC_VERSION_11
 	default "13.1.0"	if GCC_VERSION_13
 	default "12.3.0"
+
+config GCC_USE_DEFAULT_VERSION
+	bool
+	default y if !TOOLCHAINOPTS || GCC_USE_VERSION_12
+	imply KERNEL_WERROR