From ab8f923f5372baeacbf1d97c2a44446b0f9d0ddd Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 5 Jan 2016 16:14:12 -0700 Subject: [PATCH] toolchain.inc: test IASL by version string instead of number Test that the coreboot toolchain version of IASL is being used by looking for the string 'coreboot toolchain' instead of a specific version number. While this may cause people to have to rebuild their toolchains again now, it helps to prevent toolchain failures when bisecting in the future. Change-Id: I9913eeae8f29ddc3ec8c70077c05d898595eb283 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/12847 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- toolchain.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain.inc b/toolchain.inc index 2289b78b73..c8911939e8 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -174,7 +174,7 @@ $(foreach arch,$(sort $(foreach stage,\ # If iasl doesn't match the current coreboot version, fail the test # 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)" || \ + $(IASL) -v 2>&1 | grep -q "coreboot toolchain" || \ echo not-coreboot; else echo not-coreboot; fi), \ $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)\ $(warning The coreboot toolchain version of iasl \