[openwrt/openwrt] toolchain/gcc: Fix GCC version check

LEDE Commits lede-commits at lists.infradead.org
Sun Jan 8 15:35:11 PST 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a58b29ded7a6d3209aad1d2ff30b5a38d692a45f

commit a58b29ded7a6d3209aad1d2ff30b5a38d692a45f
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Tue Dec 20 00:58:19 2022 +0100

    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 at hauke-m.de>
---
 toolchain/gcc/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the lede-commits mailing list