diff --git a/Makefile.inc b/Makefile.inc
index 8d732ea3e0..2877a62c6c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -25,21 +25,6 @@ export KERNELVERSION := $(strip $(if $(GIT),\
 	$(shell git describe --dirty --always || git describe),\
 	4.0$(KERNELREVISION)))
 
-#######################################################################
-# Test for coreboot toolchain (except when explicitely not requested)
-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
-ifeq ($(CONFIG_COMPILER_GCC),y)
-ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
-_toolchain=$(shell $(CC_x86_32) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" && echo coreboot)
-ifneq ($(_toolchain),coreboot)
-$(error Please use the coreboot toolchain (or prove that your toolchain works))
-endif
-endif
-endif
-endif
-
 #######################################################################
 # Basic component discovery
 MAINBOARDDIR=$(call strip_quotes,$(CONFIG_MAINBOARD_DIR))
diff --git a/toolchain.inc b/toolchain.inc
index d69fe26e76..86dd89d57a 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -136,3 +136,20 @@ init_stages = \
 $(eval $(call toolchain_to_dir))
 
 $(call init_stages)
+
+# Test for coreboot toolchain (except when explicitely not requested)
+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
+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)' (or prove that your toolchain works))))
+endif
+endif
+endif
+ifeq ($(COMPILERFAIL),1)
+$(error consider building our compilers: make crossgcc)
+endif