From c6af3f733dd6e1a497135cb29e99e5c1d4ddbcb7 Mon Sep 17 00:00:00 2001
From: Xavier Clive <clivex@streetwisemail.com>
Date: Sat, 11 Nov 2017 15:56:55 +0100
Subject: [PATCH] make: Do not attempt to use color if the terminal cannot
support it
---
makefiles/cflags.inc.mk | 1 -
makefiles/color.inc.mk | 18 +++++++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/makefiles/cflags.inc.mk b/makefiles/cflags.inc.mk
index 396c278a8c..f3c3395aeb 100644
--- a/makefiles/cflags.inc.mk
+++ b/makefiles/cflags.inc.mk
@@ -27,7 +27,6 @@ endif
# 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
diff --git a/makefiles/color.inc.mk b/makefiles/color.inc.mk
index 7a7b1204a9..1bb1ba031d 100644
--- a/makefiles/color.inc.mk
+++ b/makefiles/color.inc.mk
@@ -1,10 +1,26 @@
+# Set colored output control sequences if the terminal supports it and if
+# not disabled by the user
+
COLOR_GREEN :=
COLOR_RED :=
COLOR_PURPLE :=
COLOR_RESET :=
COLOR_ECHO := /bin/echo
-ifeq (0, $(shell tput colors 2>&1 > /dev/null; echo $$?))
+ifeq ($(CC_NOCOLOR),)
+ available_colors:=$(shell tput colors 2> /dev/null)
+ ifeq ($(available_colors),)
+ CC_NOCOLOR = 1
+ else ifeq ($(available_colors),-1)
+ CC_NOCOLOR = 1
+ else ifeq ($(available_colors),0)
+ CC_NOCOLOR = 1
+ else
+ CC_NOCOLOR = 0
+ endif
+endif
+
+ifeq ($(CC_NOCOLOR),0)
COLOR_GREEN := \033[1;32m
COLOR_RED := \033[1;31m
COLOR_YELLOW := \033[1;33m
--
GitLab