aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-01-09 21:19:02 +0100
committerChristian Marangi <ansuelsmth@gmail.com>2023-01-09 21:25:30 +0100
commit9988832c464054847c22188e65b22cf0f86f25e6 (patch)
tree83d59d29aff768d0e40d34f36598db4a9ba27f5a
parent36bc306ae61133a4e7907f0648b8cf8ad8587619 (diff)
downloadupstream-9988832c464054847c22188e65b22cf0f86f25e6.tar.gz
upstream-9988832c464054847c22188e65b22cf0f86f25e6.tar.bz2
upstream-9988832c464054847c22188e65b22cf0f86f25e6.zip
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@gmail.com>
-rw-r--r--toolchain/gcc/Config.version2
1 files changed, 1 insertions, 1 deletions
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"