diff options
| author | Rosen Penev <rosenp@gmail.com> | 2023-03-15 20:02:45 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-08-14 20:18:42 +0200 |
| commit | 728581dc4bc7f32a29b1fbba6aa54ed6266feb33 (patch) | |
| tree | 56f8791d93c2af1f0f5a4e57b7becf51a28d9f52 /include | |
| parent | cbf8c76d0a30838961553b75ba038ecc7a29a621 (diff) | |
| download | upstream-728581dc4bc7f32a29b1fbba6aa54ed6266feb33.tar.gz upstream-728581dc4bc7f32a29b1fbba6aa54ed6266feb33.tar.bz2 upstream-728581dc4bc7f32a29b1fbba6aa54ed6266feb33.zip | |
prereq-build: increase GCC requirement to 8
The current minimum OS requirement for OpenWrt is Ubuntu 18.04, which
includes 7 and 8. 8 is necessary for ccache.
gcc and g+++ are now symlinked to staging_dir, similar to Python.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/prereq-build.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 5b63490ca3c..e5f20fff22e 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -32,28 +32,30 @@ $(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]\.?|1[0-9]\.?)', \ - gcc -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \ + Please install the GNU C Compiler (gcc) 8 or later, \ + $(CC) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \ + gcc -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \ + gcc-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \ gcc --version | grep -E 'Apple.(LLVM|clang)' )) $(eval $(call TestHostCommand,working-gcc, \ - Please reinstall the GNU C Compiler (6 or later) - \ + Please reinstall the GNU C Compiler (8 or later) - \ it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ - gcc -x c -o $(TMP_DIR)/a.out -)) + $(STAGING_DIR_HOST)/bin/gcc -x c -o $(TMP_DIR)/a.out -)) $(eval $(call SetupHostCommand,g++, \ - Please install the GNU C++ Compiler (g++) 6 or later, \ - $(CXX) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \ - g++ -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \ + Please install the GNU C++ Compiler (g++) 8 or later, \ + $(CXX) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \ + g++ -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \ + g++-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \ g++ --version | grep -E 'Apple.(LLVM|clang)' )) $(eval $(call TestHostCommand,working-g++, \ - Please reinstall the GNU C++ Compiler (6 or later) - \ + Please reinstall the GNU C++ Compiler (8 or later) - \ it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ - g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ + $(STAGING_DIR_HOST)/bin/g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ $(TMP_DIR)/a.out)) $(eval $(call RequireCHeader,ncurses.h, \ |