Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12847
-gerrit
commit eac8eae42ecbaa2be97077324517fbffcc787004 Author: Martin Roth martinroth@google.com Date: Tue Jan 5 16:14:12 2016 -0700
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 martinroth@google.com --- toolchain.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolchain.inc b/toolchain.inc index 5836a19..99d1706 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -160,7 +160,7 @@ $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage $(eval COMPILERFAIL:=1)$(warning The coreboot toolchain for '$(arch)' architecture was not found.))) #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)" || echo not-coreboot; else echo not-coreboot; fi), \ +$(if $(shell if [ -n "$(IASL)" ]; then $(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 '$(shell util/crossgcc/buildgcc -s iasl)' was not found)) else #$(CONFIG_ANY_TOOLCHAIN) $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \