am f1c5dd60: am 35e4ede5: Merge "Use automatic color option with the latest clang."

* commit 'f1c5dd60b2d1721e8f5d974f89323eac09795d64': Use automatic color option with the latest clang.
2014-11-04 17:51:26 +00:00
parent 40dabdbe77 f1c5dd60b2
commit a729f6187a
1 changed files with 1 additions and 2 deletions
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -45,8 +45,7 @@ CLANG_CONFIG_EXTRA_CFLAGS += \
 # Workaround for ccache with clang.
 # See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
 CLANG_CONFIG_EXTRA_CFLAGS += \
-  -Wno-unused-command-line-argument \
-  -fcolor-diagnostics
+  -Wno-unused-command-line-argument

 CLANG_CONFIG_UNKNOWN_CFLAGS := \
  -finline-limit=64 \