domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: accept apple llvm as fallback for gcc/g++

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44298
This commit is contained in:
Felix Fietkau
2015-02-07 10:07:31 +00:00
parent 64c4ee703a
commit 834417623d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/prereq-build.mk
View File

@@ -31,7 +31,8 @@ $(eval $(call SetupHostCommand,gcc, \
gcc49 --version | grep gcc, \ gcc49 --version | grep gcc, \
gcc48 --version | grep gcc, \ gcc48 --version | grep gcc, \
gcc47 --version | grep gcc, \ gcc47 --version | grep gcc, \
gcc46 --version | grep gcc)) gcc46 --version | grep gcc, \
gcc --version | grep Apple.LLVM ))
$(eval $(call TestHostCommand,working-gcc, \ $(eval $(call TestHostCommand,working-gcc, \
Please reinstall the GNU C Compiler - it appears to be broken, \ Please reinstall the GNU C Compiler - it appears to be broken, \
@@ -45,7 +46,8 @@ $(eval $(call SetupHostCommand,g++, \
g++49 --version | grep g++, \ g++49 --version | grep g++, \
g++48 --version | grep g++, \ g++48 --version | grep g++, \
g++47 --version | grep g++, \ g++47 --version | grep g++, \
g++46 --version | grep g++)) g++46 --version | grep g++, \
g++ --version | grep Apple.LLVM ))
$(eval $(call TestHostCommand,working-g++, \ $(eval $(call TestHostCommand,working-g++, \
Please reinstall the GNU C++ Compiler - it appears to be broken, \ Please reinstall the GNU C++ Compiler - it appears to be broken, \

3
include/prereq.mk
View File

@@ -88,7 +88,8 @@ define SetupHostCommand
define Require/$(1) define Require/$(1)
for cmd in $(call QuoteHostCommand,$(3)) $(call QuoteHostCommand,$(4)) \ for cmd in $(call QuoteHostCommand,$(3)) $(call QuoteHostCommand,$(4)) \
$(call QuoteHostCommand,$(5)) $(call QuoteHostCommand,$(6)) \ $(call QuoteHostCommand,$(5)) $(call QuoteHostCommand,$(6)) \
$(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)); do \ $(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)) \
$(call QuoteHostCommand,$(9)); do \
if [ -n "$$$$$$$$cmd" ]; then \ if [ -n "$$$$$$$$cmd" ]; then \
bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \ bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \
which "$$$$$$$${cmd%% *}")"; \ which "$$$$$$$${cmd%% *}")"; \