From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 11 Oct 2019 08:37:02 +0000 (+0200)
Subject: build: fix menuconfig submenu sorting for gcc options
X-Git-Tag: v21.02.0-rc1~4858
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=33dd522f241f8a471bbf2c06dd1afeb63d77f9d1;p=openwrt%2Fstaging%2Fhauke.git

build: fix menuconfig submenu sorting for gcc options

The hidden symbol GCC_USE_IREMAP was breaking it, move it to Config.version
instead

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 3882815d7f..7d7f34210a 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -21,11 +21,6 @@ choice
 		bool "gcc 9.x"
 endchoice
 
-config GCC_USE_IREMAP
-	default y if ( GCC_USE_VERSION_5 || GCC_USE_VERSION_7 )
-	default n
-	bool
-
 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 0658f3d52b..687857bd1f 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -16,3 +16,8 @@ config GCC_VERSION
 	default "7.4.0"		if GCC_VERSION_7
 	default "9.2.0"		if GCC_VERSION_9
 	default "8.3.0"
+
+config GCC_USE_IREMAP
+	bool
+	default y if ( GCC_USE_VERSION_5 || GCC_USE_VERSION_7 )
+	default n