From 309b420d56fc9093fdb77c3962ab13bf75cc99a6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 25 Sep 2015 17:00:14 -0700 Subject: [PATCH] Fix windows build The windows toolchain doesn't support color, only apply -fdiagnostics-color to HOST and TARGET, not HOST_CROSS. Change-Id: I17b999a2852b8d70b2d39a58befa10e2e32c4608 --- core/config.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index 697f91a34..0a01f41ed 100644 --- a/core/config.mk +++ b/core/config.mk @@ -122,7 +122,10 @@ 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 +# 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_CPPFLAGS:= -Wsign-promo COMMON_RELEASE_CPPFLAGS:=