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

Commit 6edd4cca authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am ba9bc4d7: am 0d97557d: Merge "Enable color output from gcc and clang" 

* commit 'ba9bc4d7':
  Enable color output from gcc and clang
parents 96fa30e2 ba9bc4d7

core/clang/config.mk

+7 −1
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ CLANG_CONFIG_EXTRA_CFLAGS += \ 
CLANG_CONFIG_EXTRA_CPPFLAGS += \

  -Wno-inconsistent-missing-override



# Force clang to always output color diagnostics.  Ninja will strip the ANSI

# color codes if it is not running in a terminal.

CLANG_CONFIG_EXTRA_CFLAGS += \

  -fcolor-diagnostics



CLANG_CONFIG_UNKNOWN_CFLAGS := \

  -finline-functions \

  -finline-limit=64 \
@@ -72,7 +77,8 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \ 
  -Wno-unused-but-set-variable \

  -Wno-unused-local-typedefs \

  -Wunused-but-set-parameter \

  -Wunused-but-set-variable

  -Wunused-but-set-variable \

  -fdiagnostics-color



# Clang flags for all host rules

CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=

core/config.mk

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ hide := $(if $(SHOW_COMMANDS),,@) 
COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith

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.

COMMON_GLOBAL_CFLAGS += -fdiagnostics-color



COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo

COMMON_RELEASE_CPPFLAGS:=