summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2015-12-07 14:33:44 -0700
committerMartin Roth <martinroth@google.com>2016-01-06 00:09:40 +0100
commitaf91b8b086b6fd087a99a4e88ad76e46defacf9b (patch)
tree27f7db59eae7e726970b33b9a1a2301e4960f9a0
parent31c4b64ab4527dc8265bc1736415fad8b4bcdd01 (diff)
toolchain.inc: Test for valid toolchain when ANY_TOOLCHAIN is used
Even when ANY_TOOLCHAIN is selected, a valid compiler for the requested architecture is needed. Change-Id: If1a0a1ca6b726e8e58d29c69de93546510582548 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/12681 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--toolchain.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/toolchain.inc b/toolchain.inc
index f2a6232c77..5836a197fb 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -162,6 +162,14 @@ $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage
#TODO: Figure out if iasl is even needed for the build.
$(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot; else echo not-coreboot; fi), \
$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning The coreboot toolchain version of iasl '$(shell util/crossgcc/buildgcc -s iasl)' was not found))
+else #$(CONFIG_ANY_TOOLCHAIN)
+$(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \
+ $(if $(CC_$(arch)),, $(eval COMPILERFAIL:=1) \
+ $(warning No compiler found for '$(arch)' architecture. Install one or use the coreboot toolchain?)) )
+#if iasl isn't present, fail
+#TODO: Figure out if iasl is even needed for the build.
+$(if $(IASL),, $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1) \
+ $(warning iasl not found. Please install it or use the coreboot toolchain.))
endif
ifeq ($(COMPILERFAIL),1)
ifneq ($(XGCCPATH),)