diff options
author | Martin Roth <martinroth@google.com> | 2015-11-26 22:34:42 -0700 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-12-02 02:02:42 +0100 |
commit | d9c193d8b3bcc73dff4f6085c5b6164c0f6a4108 (patch) | |
tree | 12d5de760622365a90541af962d44139fd666371 | |
parent | 335a9b61b3856486645727dfdef8ed32b036c860 (diff) |
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.
This patch adds an iasl test when testing coreboot toolchain.
Change-Id: I5b989869417c3f60057a91842b911855d9528f1b
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12543
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r-- | toolchain.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/toolchain.inc b/toolchain.inc index e35b5b5fa5..1b73ce9a89 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -151,17 +151,24 @@ 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)'))) +#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) $(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) |