diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-31 21:28:32 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-03 23:26:45 +0200 |
| commit | d6d3db05436952f68f47d35df58ad5050b1f2d66 (patch) | |
| tree | 744c9bba885eaaa22c5e245629771635511abe25 /include | |
| parent | ece815508a06ee114f549a7f0970740634fe2e62 (diff) | |
| download | openwrt-d6d3db05436952f68f47d35df58ad5050b1f2d66.tar.gz openwrt-d6d3db05436952f68f47d35df58ad5050b1f2d66.tar.bz2 openwrt-d6d3db05436952f68f47d35df58ad5050b1f2d66.zip | |
build: Improve GCC version detection
This now makes sure that the beginning of the version number gets checked
and "4.4.5" will not match was a supported version.
GCC 8 and GCC 9 are now marked as supported, but we probably have to fix
some problems for them.
Closes: FS#1433
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/prereq-build.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 6a423d2c7d..6917716342 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -28,13 +28,15 @@ $(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\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \ - gcc -dumpversion | grep -E '(4\.[8-9]|5\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \ + $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ + gcc -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ gcc48 --version | grep gcc, \ gcc49 --version | grep gcc, \ gcc5 --version | grep gcc, \ gcc6 --version | grep gcc, \ gcc7 --version | grep gcc, \ + gcc8 --version | grep gcc, \ + gcc9 --version | grep gcc, \ gcc --version | grep Apple.LLVM )) $(eval $(call TestHostCommand,working-gcc, \ @@ -45,13 +47,15 @@ $(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\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \ - g++ -dumpversion | grep -E '(4\.[8-9]|5\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \ + $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ + g++ -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \ g++48 --version | grep g++, \ g++49 --version | grep g++, \ g++5 --version | grep g++, \ g++6 --version | grep g++, \ g++7 --version | grep g++, \ + g++8 --version | grep g++, \ + g++9 --version | grep g++, \ g++ --version | grep Apple.LLVM )) $(eval $(call TestHostCommand,working-g++, \ |