Skip to content

Commit 631d74d

Browse files
nehebrobimarko
authored andcommitted
prereq-build: increase GCC requirement to 10
With ccache 4.13, it mandates a minimum of 10. Fixes: 84cb042 ("tools/ccache: update to 4.13.3") Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: openwrt/openwrt#23718 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 1ac7a56 commit 631d74d

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

include/prereq-build.mk

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,25 @@ $(eval $(call TestHostCommand,proper-umask, \
3232

3333
ifndef IB
3434
$(eval $(call SetupHostCommand,gcc, \
35-
Please install the GNU C Compiler (gcc) 8 or later, \
36-
$(CC) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
37-
gcc -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
38-
gcc-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
35+
Please install the GNU C Compiler (gcc) 10 or later, \
36+
$(CC) -dumpversion | grep -E '^(1[0-9]|[2-9][0-9])\.?', \
37+
gcc -dumpversion | grep -E '^(1[0-9]|[2-9][0-9])\.?', \
3938
gcc --version | grep -E 'Apple.(LLVM|clang)' ))
4039

4140
$(eval $(call TestHostCommand,working-gcc, \
42-
Please reinstall the GNU C Compiler (8 or later) - \
41+
Please reinstall the GNU C Compiler (10 or later) - \
4342
it appears to be broken, \
4443
echo 'int main(int argc, char **argv) { return 0; }' | \
4544
$(STAGING_DIR_HOST)/bin/gcc -x c -o $(TMP_DIR)/a.out -))
4645

4746
$(eval $(call SetupHostCommand,g++, \
48-
Please install the GNU C++ Compiler (g++) 8 or later, \
49-
$(CXX) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
50-
g++ -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
51-
g++-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
47+
Please install the GNU C++ Compiler (g++) 10 or later, \
48+
$(CXX) -dumpversion | grep -E '^(1[0-9]|[2-9][0-9])\.?', \
49+
g++ -dumpversion | grep -E '^(1[0-9]|[2-9][0-9])\.?', \
5250
g++ --version | grep -E 'Apple.(LLVM|clang)' ))
5351

5452
$(eval $(call TestHostCommand,working-g++, \
55-
Please reinstall the GNU C++ Compiler (8 or later) - \
53+
Please reinstall the GNU C++ Compiler (10 or later) - \
5654
it appears to be broken, \
5755
echo 'int main(int argc, char **argv) { return 0; }' | \
5856
$(STAGING_DIR_HOST)/bin/g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \

0 commit comments

Comments
 (0)