[coreboot-gerrit] Patch set updated for coreboot: toolchain.inc: Add IASL test as part of coreboot toolchain

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12543

-gerrit

commit 53fc7cb80e5544d5371f79253856906af5c014c7
Author: Martin Roth <martinroth at google.com>
Date:   Wed Nov 25 12:44:15 2015 -0700

    toolchain.inc: Add IASL test as part of coreboot toolchain
    
    Even though coreboot has IASL as part of its toolchain, it was not being
    picked up when testing to make sure coreboot is being compiled with
    the coreboot toolchain.
    
    - Add iasl test when testing coreboot toolchain
    - update instructions for building, and how to allow building with
    any toolchain.
    
    Change-Id: I5b989869417c3f60057a91842b911855d9528f1b
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 toolchain.inc | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/toolchain.inc b/toolchain.inc
index 0f3da83..1b73ce9 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -151,14 +151,27 @@ ifneq ($(NOCOMPILE),1)
 # only run if we're doing a build (not for tests, kconfig, ...), using gcc
 # rationale: gcc versions by Linux distributions tend to be quite messed up
 COMPILERFAIL:=0
+IASLFAIL:=0
 ifeq ($(CONFIG_COMPILER_GCC),y)
 ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
 $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \
 	$(if $(shell $(CC_$(arch)) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" || echo not-coreboot), \
-		$(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)' (or prove that your toolchain works))))
+		$(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)')))
+#if iasl doesn't match the current coreboot version, fail the test
+$(if $(shell $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot), \
+	$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl - $(shell util/crossgcc/buildgcc -s iasl)))
 endif
 endif
 endif
 ifeq ($(COMPILERFAIL),1)
-$(error consider building our compilers: make crossgcc)
+$(warning )
+$(warning To build the entire coreboot toolchain: make crossgcc)
+ifeq ($(IASLFAIL),1)
+$(warning To build just IASL: make iasl)
+endif
+$(warning For more toolchain build targets: make help_toolchain)
+$(warning )
+$(warning *** To try to use your own toolchain, run 'make menuconfig', then select the)
+$(warning *** config option: General setup -> Allow building with any toolchain)
+$(error Note that this is NOT supported.  Using it means you're on your own)
 endif