Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12543
-gerrit
commit eced8b087e25129c61ec048b0131c9e60bb2adcf Author: Martin Roth martinroth@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@google.com --- toolchain.inc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc index 0f3da83..7a3f576 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -151,14 +151,28 @@ 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 was just found in the path instead of the coreboot tools dir, fail the toolchain. +ifeq ($(IASL),iasl) +$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl) +endif 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