diff options
| author | Stephen Hines <srhines@google.com> | 2014-11-04 17:44:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 17:44:44 +0000 |
| commit | f1c5dd60b2d1721e8f5d974f89323eac09795d64 (patch) | |
| tree | fb86dec5197f741cd6498d1d81e654d91303da06 /core/clang | |
| parent | 17c0e737047dcfa74cbd2386660b67bcde284f4c (diff) | |
| parent | 35e4ede5974053d05ae0f8791e60ba77a31907b3 (diff) | |
| download | build-f1c5dd60b2d1721e8f5d974f89323eac09795d64.zip build-f1c5dd60b2d1721e8f5d974f89323eac09795d64.tar.gz build-f1c5dd60b2d1721e8f5d974f89323eac09795d64.tar.bz2 | |
am 35e4ede5: Merge "Use automatic color option with the latest clang."
* commit '35e4ede5974053d05ae0f8791e60ba77a31907b3':
Use automatic color option with the latest clang.
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/config.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index f2aae92..3f56359 100644 --- 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 \ |