[coreboot-gerrit] Patch set updated for coreboot: toolchain.inc: Test for toolchain when using llvm/clang
Martin Roth (martinroth@google.com)
gerrit at coreboot.org
Wed Dec 30 23:33:20 CET 2015
Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12676
-gerrit
commit bdf9bbd33f61b960cfbfd0fe3662df67200fa7b9
Author: Martin Roth <martinroth at google.com>
Date: Mon Dec 7 14:07:10 2015 -0700
toolchain.inc: Test for toolchain when using llvm/clang
Change-Id: I45ed5e289f9bfae90d71938243f921588b256e39
Signed-off-by: Martin Roth <martinroth at google.com>
---
toolchain.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc
index bbd99ca..c03881c 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -148,21 +148,21 @@ $(call init_stages)
# Test for coreboot toolchain (except when explicitly not requested)
ifneq ($(NOCOMPILE),1)
-# only run if we're doing a build (not for tests, kconfig, ...), using gcc
+# only run if we're doing a build (not for tests, kconfig, ...)
# rationale: gcc versions by Linux distributions tend to be quite messed up
+# llvm/clang also needs patches supplied by the coreboot build
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 if [ -n "$(CC_$(arch))" ]; then $(CC_$(arch)) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" || echo not-coreboot; else echo not-coreboot; fi), \
+ $(if $(shell if [ -n "$(CC_$(arch))" ]; then $(CC_$(arch)) -v 2>&1 |grep -q "coreboot toolchain" || echo not-coreboot; else echo not-coreboot; fi), \
$(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 if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot; else echo not-coreboot; fi), \
$(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)
ifneq ($(XGCCPATH),)
$(warning )
More information about the coreboot-gerrit
mailing list