diff options
| author | Robert Marko <robimarko@gmail.com> | 2024-04-08 22:05:19 +0200 |
|---|---|---|
| committer | Robert Marko <robimarko@gmail.com> | 2024-04-09 19:30:41 +0200 |
| commit | 12b2cb2ec3f1366b65caa0dbbdd83846c1c88d4e (patch) | |
| tree | 919a7c2adfc3a0fdbd87151df81c573a091c68b6 | |
| parent | a68eb991911794b1c3814acb17ca829cb311fdcd (diff) | |
| download | openwrt-12b2cb2ec3f1366b65caa0dbbdd83846c1c88d4e.tar.gz openwrt-12b2cb2ec3f1366b65caa0dbbdd83846c1c88d4e.tar.bz2 openwrt-12b2cb2ec3f1366b65caa0dbbdd83846c1c88d4e.zip | |
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>
| -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 fd98914075..85abbdabb7 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_13 - 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 54bb4445b3..fe956d65b7 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -12,3 +12,8 @@ config GCC_VERSION default "11.3.0" if GCC_VERSION_11 default "12.3.0" if GCC_VERSION_12 default "13.2.0" + +config GCC_USE_DEFAULT_VERSION + bool + default y if !TOOLCHAINOPTS || GCC_USE_VERSION_13 + imply KERNEL_WERROR |