From 6f4a45e39239367258b4232c03fee8e10a7dc122 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 30 Mar 2026 04:42:29 +0100
Subject: [PATCH] Fix color diagnostics for arm-none-eabi-gcc (#26115)

---
 builddefs/common_rules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index 6ba42f3b5b..f3cb517aa5 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -66,9 +66,9 @@ CFLAGS += $(CDEFS)
 CFLAGS += -O$(OPT)
 # add color
 ifeq ($(COLOR),true)
-ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
-	CFLAGS+= -fdiagnostics-color
-endif
+    CFLAGS+= -fdiagnostics-color=always
+else
+    CFLAGS+= -fdiagnostics-color=never
 endif
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes