From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 14 Jul 2016 10:06:39 +0000 (+0200)
Subject: toolchain/gcc: clean up remaining references to the old linaro version
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e031940570e9f0cf0eadd8a17232e3bb487e97db;p=openwrt%2Fstaging%2Fdedeckeh.git

toolchain/gcc: clean up remaining references to the old linaro version

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

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 47f516d40d..30df7235a4 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -4,13 +4,12 @@ config GCC_VERSION_4_8_ARC
 
 config GCC_VERSION
 	string
-	default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
 	default "arc-2016.03"   if GCC_VERSION_4_8_ARC
 	default "5.4.0"
 
 config GCC_VERSION_4_8
 	bool
-	default y	if (GCC_VERSION_4_8_LINARO || GCC_VERSION_4_8_ARC)
+	default y	if GCC_VERSION_4_8_ARC
 
 config GCC_VERSION_5
 	default y if (!TOOLCHAINOPTS && !arc)
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 5850f4363c..58566ce8cf 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -45,11 +45,7 @@ endif
 PATCH_DIR=../patches/$(GCC_VERSION)
 
 BUGURL=http://www.lede-project.org/bugs/
-ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
-  PKGVERSION=LEDE/Linaro GCC $(PKG_REV) $(REVISION)
-else
-  PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
-endif
+PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
 
 HOST_BUILD_PARALLEL:=1