From 5e00d5c7904c1a3121d58c363cb3df0cb07e7af4 Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Mon, 2 Dec 2013 19:08:45 +0100
Subject: [PATCH] Make the ccache-free case look like the ccache case.

This fixes a problem with `make check` clang -Werror failing due to an
unused -Llib arg.
---
 configure      | 8 ++++----
 mk/platform.mk | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index bd76c32fbfa..864cf8c3d51 100755
--- a/configure
+++ b/configure
@@ -893,11 +893,11 @@ do
             LLVM_CC_64="ccache clang -Qunused-arguments"
             ;;
             ("clang")
-            LLVM_CXX_32="clang++ -m32"
-            LLVM_CC_32="clang -m32"
+            LLVM_CXX_32="clang++ -m32 -Qunused-arguments"
+            LLVM_CC_32="clang -m32 -Qunused-arguments"
 
-            LLVM_CXX_64="clang++"
-            LLVM_CC_64="clang"
+            LLVM_CXX_64="clang++ -Qunused-arguments"
+            LLVM_CC_64="clang -Qunused-arguments"
             ;;
             ("ccache gcc")
             LLVM_CXX_32="ccache g++ -m32"
diff --git a/mk/platform.mk b/mk/platform.mk
index 35d4279eaef..8a55654beba 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -88,14 +88,15 @@ AR := ar
 
 CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
 ifeq ($(CFG_C_COMPILER),clang)
+  # The -Qunused-arguments sidesteps spurious warnings from clang
   ifeq ($(origin CC),default)
-    CC=clang
+    CC=clang -Qunused-arguments
   endif
   ifeq ($(origin CXX),default)
-    CXX=clang++
+    CXX=clang++ -Qunused-arguments
   endif
   ifeq ($(origin CPP),default)
-    CPP=clang
+    CPP=clang -Qunused-arguments
   endif
 else
 ifeq ($(CFG_C_COMPILER),gcc)