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

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

Browse Source 
am: 41fed8c082

* commit '41fed8c08262bd8ff52bbebd8429dbd2042c4450':
  Don't force color diagnostics outside of ninja
This commit is contained in:
Colin Cross
2016-02-01 19:02:07 +00:00
committed by android-build-merger
parent b1e250b44a 41fed8c082
commit 01394871fd
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

@@ -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

@@ -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:=