tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Don\'t force color diagnostics outside of ninja" am: 41fed8c082

Browse source 
am: 01394871fd

* commit '01394871fdbc25316a87edca4a09b1075707e572':
  Don't force color diagnostics outside of ninja
This commit is contained in:
Colin Cross 2016-02-01 19:40:11 +00:00 committed by android-build-merger
commit 715172fa26
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/clang/config.mk
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 \

2
core/config.mk
View file

@ -596,7 +596,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:=