diff --git a/makefiles/cflags.inc.mk b/makefiles/cflags.inc.mk
index c5e3c52e8b..396c278a8c 100644
--- a/makefiles/cflags.inc.mk
+++ b/makefiles/cflags.inc.mk
@@ -25,9 +25,13 @@ ifeq ($(shell $(CC) -fno-delete-null-pointer-checks -E - 2>/dev/null >/dev/null
   endif
 endif
 
-# Use colored gcc output if the compiler supports this
-ifeq ($(shell $(CC) -fdiagnostics-color -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
-  CFLAGS += -fdiagnostics-color
+# Use colored compiler output if the compiler supports this and if this is not
+# disabled by the user
+CC_NOCOLOR ?= 0
+ifeq ($(CC_NOCOLOR),0)
+  ifeq ($(shell $(CC) -fdiagnostics-color -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
+    CFLAGS += -fdiagnostics-color
+  endif
 endif
 
 # Fast-out on old style function definitions.