From: Petr Štetiar <ynezz@true.cz>
Date: Mon, 1 Mar 2021 12:29:19 +0000 (+0100)
Subject: build: fix checks for GCC11
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cae69d558135456976b8fc6cb08530d1358cf6d5;p=openwrt%2Fstaging%2Fblocktrron.git

build: fix checks for GCC11

Fedora 34 already uses GCC11.

Reported-by: Marcin Juszkiewicz <marcin-openwrt@juszkiewicz.com.pl>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 8a6c4bb468..bbeba3f8ff 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -26,8 +26,8 @@ $(eval $(call TestHostCommand,proper-umask, \
 ifndef IB
 $(eval $(call SetupHostCommand,gcc, \
 	Please install the GNU C Compiler (gcc) 6 or later, \
-	$(CC) -dumpversion | grep -E '^([6-9]\.?|10\.?)', \
-	gcc -dumpversion | grep -E '^([6-9]\.?|10\.?)', \
+	$(CC) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
+	gcc -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
 	gcc --version | grep -E 'Apple.(LLVM|clang)' ))
 
 $(eval $(call TestHostCommand,working-gcc, \
@@ -38,8 +38,8 @@ $(eval $(call TestHostCommand,working-gcc, \
 
 $(eval $(call SetupHostCommand,g++, \
 	Please install the GNU C++ Compiler (g++) 6 or later, \
-	$(CXX) -dumpversion | grep -E '^([6-9]\.?|10\.?)', \
-	g++ -dumpversion | grep -E '^([6-9]\.?|10\.?)', \
+	$(CXX) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
+	g++ -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
 	g++ --version | grep -E 'Apple.(LLVM|clang)' ))
 
 $(eval $(call TestHostCommand,working-g++, \