StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't force color diagnostics outside of ninja

Browse Source 
Building with USE_NINJA=false and piping build output to a file will
result in ANSI color codes in the build output.  Only force ANSI codes
on when building with ninja, which strips the ANSI codes when writing
build output to a non-TTY.

Change-Id: Ifd2fb53799fd99c23b7ad91cdb84d943bf707db0
This commit is contained in:
Colin Cross
2016-01-04 14:31:25 -08:00
parent 4203ee20f1
commit dbd43849fb
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/clang/config.mk
View File

@@ -50,8 +50,10 @@ CLANG_CONFIG_EXTRA_CPPFLAGS += \
# Force clang to always output color diagnostics. Ninja will strip the ANSI # Force clang to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal. # color codes if it is not running in a terminal.
ifdef BUILDING_WITH_NINJA
CLANG_CONFIG_EXTRA_CFLAGS += \ CLANG_CONFIG_EXTRA_CFLAGS += \
-fcolor-diagnostics -fcolor-diagnostics
endif
CLANG_CONFIG_UNKNOWN_CFLAGS := \ CLANG_CONFIG_UNKNOWN_CFLAGS := \
-finline-functions \ -finline-functions \

2
core/config.mk
View File

@@ -587,7 +587,9 @@ COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
# Force gcc to always output color diagnostics. Ninja will strip the ANSI # Force gcc to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal. # color codes if it is not running in a terminal.
ifdef BUILDING_WITH_NINJA
COMMON_GLOBAL_CFLAGS += -fdiagnostics-color COMMON_GLOBAL_CFLAGS += -fdiagnostics-color
endif
COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo
COMMON_RELEASE_CPPFLAGS:= COMMON_RELEASE_CPPFLAGS:=