p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am d98fe91a: am 6b02b76a: Merge "Fix gcc color diagnostics" 

* commit 'd98fe91a7524d40808ae4ed562aeb38e9eedf593':
  Fix gcc color diagnostics
This commit is contained in:
Colin Cross 2015-10-03 00:51:02 +00:00 committed by Android Git Automerger
parent 2f09a63381 d98fe91a75
commit acf00a8c17
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/combo/HOST_CROSS_windows-x86.mk
View File

@ -53,3 +53,6 @@ $(combo_var_prefix)SHLIB_SUFFIX := .dll
$(combo_var_prefix)EXECUTABLE_SUFFIX := .exe $(combo_var_prefix)EXECUTABLE_SUFFIX := .exe
$(combo_var_prefix)IS_64_BIT := $(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

7
core/config.mk
View File

@ -123,10 +123,7 @@ COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
# Force gcc to always output color diagnostics. Ninja will strip the ANSI # Force gcc to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal. # 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 COMMON_GLOBAL_CFLAGS += -fdiagnostics-color
# 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_GLOBAL_CPPFLAGS:= -Wsign-promo
COMMON_RELEASE_CPPFLAGS:= COMMON_RELEASE_CPPFLAGS:=
@ -632,7 +629,7 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CPPFLAGS += $($(HOST_2ND_ARCH_VAR_PREFIX)
endif endif
ifdef HOST_CROSS_OS 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_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
HOST_CROSS_GLOBAL_CPPFLAGS += $(COMMON_GLOBAL_CPPFLAGS) HOST_CROSS_GLOBAL_CPPFLAGS += $(COMMON_GLOBAL_CPPFLAGS)
HOST_CROSS_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS) HOST_CROSS_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)