diff options
| author | Martin Roth <martinroth@google.com> | 2015-12-07 14:07:10 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-01-04 16:51:33 +0100 |
| commit | a23e2ce5b7915339f4106171cd65d53c87483032 (patch) | |
| tree | 2d4cc2c2a403f4675204c5061630e9d7e6d991dd | |
| parent | 2ab652f60624d5e46a14207b4428433ba2735f03 (diff) | |
toolchain.inc: Test for toolchain when using llvm/clang
Change-Id: I45ed5e289f9bfae90d71938243f921588b256e39
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12676
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | toolchain.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolchain.inc b/toolchain.inc index bbd99caf8f..c03881c802 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 ) |