diff options
| author | Felix Fietkau <nbd@nbd.name> | 2019-10-10 13:42:56 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-05-24 14:42:52 +0200 |
| commit | 401fe1a59997fd066cab878aadc2fa2d200aefef (patch) | |
| tree | 78708d98bda1175c799981c345fb0e0eba5d7491 | |
| parent | 6ee6496d07c70d7559d2110fa67aa13d63e110f7 (diff) | |
| download | upstream-401fe1a59997fd066cab878aadc2fa2d200aefef.tar.gz upstream-401fe1a59997fd066cab878aadc2fa2d200aefef.tar.bz2 upstream-401fe1a59997fd066cab878aadc2fa2d200aefef.zip | |
build: adjust gcc/g++ version checks for newer apple compilers
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry-picked from commit 46a129194de0f9e2f71b6526634569e1ec802504)
| -rw-r--r-- | include/prereq-build.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 79d6ae1e6c..d626ab024f 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -37,7 +37,7 @@ $(eval $(call SetupHostCommand,gcc, \ gcc7 --version | grep gcc, \ gcc8 --version | grep gcc, \ gcc9 --version | grep gcc, \ - gcc --version | grep Apple.LLVM )) + gcc --version | grep -E 'Apple.(LLVM|clang)' )) $(eval $(call TestHostCommand,working-gcc, \ \nPlease reinstall the GNU C Compiler (4.8 or later) - \ @@ -56,7 +56,7 @@ $(eval $(call SetupHostCommand,g++, \ g++7 --version | grep g++, \ g++8 --version | grep g++, \ g++9 --version | grep g++, \ - g++ --version | grep Apple.LLVM )) + g++ --version | grep -E 'Apple.(LLVM|clang)' )) $(eval $(call TestHostCommand,working-g++, \ \nPlease reinstall the GNU C++ Compiler (4.8 or later) - \ |