Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbd43849 authored by Colin Cross's avatar Colin Cross
Browse files

Don't force color diagnostics outside of ninja 

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
parent 4203ee20

core/clang/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -50,8 +50,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 \

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -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:=