commit af401c1a60d61122d6f542aa32ad79c500da33bd
author David 'Digit' Turner <digit@google.com> Fri Jun 06 03:33:05 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 06 03:33:05 2014 +0000
tree 233e8b14a4a6a4a0f73221d14414a14f5f51b640
parent 7a265c325fa416e921148f82f33ab7a81db94f40
parent d6e32c82a35f01646940b9cec8f3816bf6052c69

Merge "Remove hideous warnings with clang-based builds." into idea133

Makefile.android

diff --git a/Makefile.android b/Makefile.android
index b5a6008..9db5415 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -156,6 +156,16 @@
 #
 MY_CFLAGS += -Wall $(GCC_W_NO_MISSING_FIELD_INITIALIZERS)
 
+# When using clang and ccache, disable the spammy warnings about unused
+# parameters during compilation, and re-enable colored output.
+#
+# See http://petereisentraut.blogspot.fr/2011/05/ccache-and-clang.html
+ifneq (,$(filter %ccache,$(MY_CC)))
+  ifneq (,$(filter LLVM,$(shell $(HOST_CC) -v 2>&1)))
+    MY_CFLAGS := -Qunused-arguments -fcolor-diagnostics $(MY_CFLAGS)
+  endif
+endif
+
 # Needed to build block.c on Linux/x86_64.
 MY_CFLAGS += -D_GNU_SOURCE=1