[openwrt/openwrt] build: fix checks for GCC11
LEDE Commits
lede-commits at lists.infradead.org
Wed Mar 3 22:04:34 GMT 2021
ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/a29b3983248588505e927317a162edb8187b94f9
commit a29b3983248588505e927317a162edb8187b94f9
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Mon Mar 1 13:29:19 2021 +0100
build: fix checks for GCC11
Fedora 34 already uses GCC11.
Reported-by: Marcin Juszkiewicz <marcin-openwrt at juszkiewicz.com.pl>
Signed-off-by: Petr Štetiar <ynezz at true.cz>
(cherry picked from commit cae69d558135456976b8fc6cb08530d1358cf6d5)
---
include/prereq-build.mk | 8 ++++----
1 file 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++, \
More information about the lede-commits
mailing list