ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

config: fix CONFIG_GDB appearing in main menuconfig menu

Browse Source 
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: 501ef81040 ("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 12b2cb2ec3)
This commit is contained in:
Robert Marko 2024-04-08 22:05:19 +02:00 committed by Christian Marangi
parent 915dfbdbb1
commit e8cc17e147
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolchain/gcc/Config.in
View File

@ -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

5
toolchain/gcc/Config.version
View File

@ -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