From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 19 Dec 2022 23:58:19 +0000 (+0100)
Subject: toolchain/gcc: Fix GCC version check
X-Git-Tag: v23.05.0-rc1~1334
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a58b29ded7a6d3209aad1d2ff30b5a38d692a45f;p=openwrt%2Fstaging%2Fhauke.git

toolchain/gcc: Fix GCC version check

The version check which sets GCC_VERSION_FILE to the correct value only
worked when the advanced options menu was active and not when it was not
active.

Thank you Tony Butler for the fix.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 6661b0aa38..ea2e2634b6 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -178,7 +178,7 @@ define Host/SetToolchainInfo
 endef
 
 
-ifdef CONFIG_GCC_USE_VERSION_12
+ifeq ($(GCC_MAJOR_VERSION),12)
 	GCC_VERSION_FILE:=gcc/genversion.cc
 else
 	GCC_VERSION_FILE:=gcc/version.c