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

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

am 6b02b76a: Merge "Fix gcc color diagnostics" 

* commit '6b02b76a':
  Fix gcc color diagnostics
parents 210d2d08 6b02b76a

core/combo/HOST_CROSS_windows-x86.mk

+3 −0
Original line number Diff line number Diff line
@@ -53,3 +53,6 @@ $(combo_var_prefix)SHLIB_SUFFIX := .dll 
$(combo_var_prefix)EXECUTABLE_SUFFIX := .exe



$(combo_var_prefix)IS_64_BIT :=



# The mingw gcc is 4.8, 4.9 is required for color diagnostics

$(combo_var_prefix)UNKNOWN_CFLAGS := -fdiagnostics-color

core/config.mk

+2 −5
Original line number Diff line number Diff line
@@ -123,10 +123,7 @@ 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.

# Use host and target GLOBAL_CFLAGS so it doesn't apply to HOST_CROSS, the windows

# toolchain is still 4.8 and doesn't support color.

HOST_GLOBAL_CFLAGS += -fdiagnostics-color

TARGET_GLOBAL_CFLAGS += -fdiagnostics-color

COMMON_GLOBAL_CFLAGS += -fdiagnostics-color



COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo

COMMON_RELEASE_CPPFLAGS:=
@@ -632,7 +629,7 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CPPFLAGS += $($(HOST_2ND_ARCH_VAR_PREFIX) 
endif



ifdef HOST_CROSS_OS

HOST_CROSS_GLOBAL_CFLAGS += $(COMMON_GLOBAL_CFLAGS)

HOST_CROSS_GLOBAL_CFLAGS += $(filter-out $(HOST_CROSS_UNKNOWN_CFLAGS),$(COMMON_GLOBAL_CFLAGS))

HOST_CROSS_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)

HOST_CROSS_GLOBAL_CPPFLAGS += $(COMMON_GLOBAL_CPPFLAGS)

HOST_CROSS_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)