Skip to content

Commit 8cb59d3

Browse files
committed
auto merge of #10771 : pnkfelix/rust/fix-make-check-for-ccacheless-clang, r=acrichto
This fixes a problem with `make check` clang -Werror failing due to an unused -Llib arg.
2 parents 3a3ffab + 5e00d5c commit 8cb59d3

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -893,11 +893,11 @@ do
893893
LLVM_CC_64="ccache clang -Qunused-arguments"
894894
;;
895895
("clang")
896-
LLVM_CXX_32="clang++ -m32"
897-
LLVM_CC_32="clang -m32"
896+
LLVM_CXX_32="clang++ -m32 -Qunused-arguments"
897+
LLVM_CC_32="clang -m32 -Qunused-arguments"
898898

899-
LLVM_CXX_64="clang++"
900-
LLVM_CC_64="clang"
899+
LLVM_CXX_64="clang++ -Qunused-arguments"
900+
LLVM_CC_64="clang -Qunused-arguments"
901901
;;
902902
("ccache gcc")
903903
LLVM_CXX_32="ccache g++ -m32"

mk/platform.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,15 @@ AR := ar
8888

8989
CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
9090
ifeq ($(CFG_C_COMPILER),clang)
91+
# The -Qunused-arguments sidesteps spurious warnings from clang
9192
ifeq ($(origin CC),default)
92-
CC=clang
93+
CC=clang -Qunused-arguments
9394
endif
9495
ifeq ($(origin CXX),default)
95-
CXX=clang++
96+
CXX=clang++ -Qunused-arguments
9697
endif
9798
ifeq ($(origin CPP),default)
98-
CPP=clang
99+
CPP=clang -Qunused-arguments
99100
endif
100101
else
101102
ifeq ($(CFG_C_COMPILER),gcc)

0 commit comments

Comments
 (0)