Merge "Don't force color diagnostics outside of ninja"

This commit is contained in:
Colin Cross 2016-02-01 18:57:50 +00:00 committed by Gerrit Code Review
commit 41fed8c082
2 changed files with 4 additions and 0 deletions

View file

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

View file

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