aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2021-03-01 13:29:19 +0100
committerPetr Štetiar <ynezz@true.cz>2021-03-03 23:01:18 +0100
commita29b3983248588505e927317a162edb8187b94f9 (patch)
tree2e1649ee7d7a56a93c6ce5d30028774c01eeed9d
parentff6b36b9548bbb869c2f5a5ffc0e415e25bc857e (diff)
downloadupstream-a29b3983248588505e927317a162edb8187b94f9.tar.gz
upstream-a29b3983248588505e927317a162edb8187b94f9.tar.bz2
upstream-a29b3983248588505e927317a162edb8187b94f9.zip
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> (cherry picked from commit cae69d558135456976b8fc6cb08530d1358cf6d5)
-rw-r--r--include/prereq-build.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 6dce11cba2..7c668968b6 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) 4.8 or later, \
- $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
- gcc -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
+ $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|1[0-9]\.?)', \
+ gcc -dumpversion | grep -E '^(4\.[8-9]|[5-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++) 4.8 or later, \
- $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
- g++ -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
+ $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|1[0-9]\.?)', \
+ g++ -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|1[0-9]\.?)', \
g++ --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-g++, \