riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: Do not attempt to use color if the terminal cannot support it

Browse Source
This commit is contained in:
Xavier Clive 2017-11-11 15:56:55 +01:00
parent 4952ffbae7
commit c6af3f733d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/cflags.inc.mk
View File

@ -27,7 +27,6 @@ endif
# Use colored compiler output if the compiler supports this and if this is not # Use colored compiler output if the compiler supports this and if this is not
# disabled by the user # disabled by the user
CC_NOCOLOR ?= 0
ifeq ($(CC_NOCOLOR),0) ifeq ($(CC_NOCOLOR),0)
ifeq ($(shell $(CC) -fdiagnostics-color -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0) ifeq ($(shell $(CC) -fdiagnostics-color -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
CFLAGS += -fdiagnostics-color CFLAGS += -fdiagnostics-color

18
makefiles/color.inc.mk
View File

@ -1,10 +1,26 @@
# Set colored output control sequences if the terminal supports it and if
# not disabled by the user
COLOR_GREEN := COLOR_GREEN :=
COLOR_RED := COLOR_RED :=
COLOR_PURPLE := COLOR_PURPLE :=
COLOR_RESET := COLOR_RESET :=
COLOR_ECHO := /bin/echo 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_GREEN := \033[1;32m
COLOR_RED := \033[1;31m COLOR_RED := \033[1;31m
COLOR_YELLOW := \033[1;33m COLOR_YELLOW := \033[1;33m