diff --git a/toolchain.inc b/toolchain.inc
index ef3ae16641..7a0864eead 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -174,9 +174,13 @@ $(warning To build just IASL: make iasl)
 endif #($(IASLFAIL),1)
 $(warning For more toolchain build targets: make help_toolchain)
 $(warning )
-$(warning *** To try to use your own toolchain, run 'make menuconfig', then select the)
-$(warning *** config option: General setup -> Allow building with any toolchain)
-$(error Note that this is NOT supported.  Using it means you're on your own)
+ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
+$(warning To try to use any toolchain in your path, run 'make menuconfig', then select)
+$(warning the config option: 'General setup', and 'Allow building with any toolchain')
+$(warning Note that this is NOT supported.  Using it means you're on your own.)
+$(warning )
+endif #($(CONFIG_ANY_TOOLCHAIN),y)
+$(error Halting the build)
 endif #($(COMPILERFAIL),1)
 
 endif #($(NOCOMPILE),1)