From: Petr Štetiar Date: Mon, 1 Mar 2021 12:29:19 +0000 (+0100) Subject: build: fix checks for GCC11 X-Git-Tag: v1.5.5-20210401~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aefa0305680e8d238103128720a35d74618b9f3b;p=librecmc%2Flibrecmc.git build: fix checks for GCC11 Fedora 34 already uses GCC11. Reported-by: Marcin Juszkiewicz Signed-off-by: Petr Štetiar (cherry picked from commit cae69d558135456976b8fc6cb08530d1358cf6d5) --- diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 48af310c57..b24ca05caf 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -28,8 +28,8 @@ $(eval $(call TestHostCommand,proper-umask, \ $(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, \ @@ -40,8 +40,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++, \