[openwrt/openwrt] toolchain/gcc: fix broken gcc version selection

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 9 12:25:34 PST 2023


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9988832c464054847c22188e65b22cf0f86f25e6

commit 9988832c464054847c22188e65b22cf0f86f25e6
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Mon Jan 9 21:19:02 2023 +0100

    toolchain/gcc: fix broken gcc version selection
    
    Config evaluation require default with if to be put before the generic
    default config with no condition. Putting the default config before any
    conditional default results in always selecting the non conditional one.
    
    This results in the version be hardcoded to gcc 12 even if gcc 11 is
    selected in the Advanced build options.
    
    Fix this by putting the gcc 12 default option as last after ANY
    conditional default config.
    
    Fixes: d9de5252a44e ("toolchain/gcc: switch to version 12 by default")
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 toolchain/gcc/Config.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 6202ca732f..7d4bedfbe9 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -4,5 +4,5 @@ config GCC_VERSION_11
 
 config GCC_VERSION
 	string
-	default "12.2.0"
 	default "11.3.0"	if GCC_VERSION_11
+	default "12.2.0"




More information about the lede-commits mailing list