From: Yorkie Liu <yorkiefixer@gmail.com>
Date: Tue, 19 Nov 2019 05:41:10 +0000 (+0800)
Subject: toolchain/gcc: correct the check expr for newer clang
X-Git-Tag: v18.06.6~18
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=84b74bcb0d962dc192dc6c3f0ada3e0eba6fb593;p=openwrt%2Fstaging%2Fpepe2k.git

toolchain/gcc: correct the check expr for newer clang

This fixes gcc build error within clang 11.0, it tweaks the version
string from LLVM to clang.

Signed-off-by: Yorkie Liu <yorkiefixer@gmail.com>
(cherry picked from commit 65a561fd0919eafff2363ae8324db64be2a57f77)
---

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index fb60e57c73..0b7e5f468e 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -96,7 +96,7 @@ endif
 
 GCC_CONFIGURE:= \
 	SHELL="$(BASH)" \
-	$(if $(shell gcc --version 2>&1 | grep LLVM), \
+	$(if $(shell gcc --version 2>&1 | grep -E "Apple.(LLVM|clang)"), \
 		CFLAGS="-O2 -fbracket-depth=512 -pipe" \
 		CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \
 	) \