diff options
| author | Robert Marko | 2024-04-08 20:05:19 +0000 |
|---|---|---|
| committer | Christian Marangi | 2024-04-18 09:52:56 +0000 |
| commit | e8cc17e147c092d99430f6c707c2ca94dfad40ae (patch) | |
| tree | 9ec76c1fdbecd514be622a0e0f965fa0316114b4 | |
| parent | 915dfbdbb1ae16fb16bf07ed836d8979c30f1fbe (diff) | |
| download | openwrt-e8cc17e147c092d99430f6c707c2ca94dfad40ae.tar.gz | |
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: 501ef81040ba ("config: select KERNEL_WERROR if building with default GCC version")
Signed-off-by: Robert Marko <robimarko@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [rebased]
(cherry picked from commit 12b2cb2ec3f1366b65caa0dbbdd83846c1c88d4e)
| -rw-r--r-- | toolchain/gcc/Config.in | 5 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index be975e5334..9156f9c263 100644 --- 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 index 7126a0c883..e40d6b2df3 100644 --- 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 |