ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 22:23:27 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

prereq-build: increase GCC requirement to 8

Browse Source 
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>
This commit is contained in:
Rosen Penev 2023-03-15 20:02:45 -07:00 committed by Hauke Mehrtens
parent cbf8c76d0a
commit 728581dc4b
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/prereq-build.mk
View File

@ -32,28 +32,30 @@ $(eval $(call TestHostCommand,proper-umask, \
ifndef IB ifndef IB
$(eval $(call SetupHostCommand,gcc, \ $(eval $(call SetupHostCommand,gcc, \
Please install the GNU C Compiler (gcc) 6 or later, \ Please install the GNU C Compiler (gcc) 8 or later, \
$(CC) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \ $(CC) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
gcc -dumpversion | grep -E '^([6-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)' )) gcc --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-gcc, \ $(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, \ it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \ 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++, \ $(eval $(call SetupHostCommand,g++, \
Please install the GNU C++ Compiler (g++) 6 or later, \ Please install the GNU C++ Compiler (g++) 8 or later, \
$(CXX) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \ $(CXX) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
g++ -dumpversion | grep -E '^([6-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)' )) g++ --version | grep -E 'Apple.(LLVM|clang)' ))
$(eval $(call TestHostCommand,working-g++, \ $(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, \ it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \ 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)) $(TMP_DIR)/a.out))
$(eval $(call RequireCHeader,ncurses.h, \ $(eval $(call RequireCHeader,ncurses.h, \

4
rules.mk
View File

@ -240,8 +240,8 @@ PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
export PKG_CONFIG export PKG_CONFIG
HOSTCC:=gcc HOSTCC:=$(STAGING_DIR_HOST)/bin/gcc
HOSTCXX:=g++ HOSTCXX:=$(STAGING_DIR_HOST)/bin/g++
HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include) HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
HOST_CXXFLAGS:= HOST_CXXFLAGS:=
HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS) HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)