From 16193762d8eb8d8fae5bc27d02efa3602ace2d1b Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 2 Jan 2015 00:44:05 -0500 Subject: [PATCH] Bug 1117031 - Turn off unused argument warnings for clang-cl; r=glandium --- configure.in | 4 ++-- js/src/configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 9b0ee80353a8..242f18f3c03a 100644 --- a/configure.in +++ b/configure.in @@ -1245,11 +1245,11 @@ MOZ_ANDROID_STLPORT dnl ======================================================== dnl Suppress Clang Argument Warnings dnl ======================================================== -if test -n "$CLANG_CC"; then +if test -n "${CLANG_CC}${CLANG_CL}"; then _WARNINGS_CFLAGS="-Qunused-arguments ${_WARNINGS_CFLAGS}" CPPFLAGS="-Qunused-arguments ${CPPFLAGS}" fi -if test -n "$CLANG_CXX"; then +if test -n "${CLANG_CXX}${CLANG_CL}"; then _WARNINGS_CXXFLAGS="-Qunused-arguments ${_WARNINGS_CXXFLAGS}" fi diff --git a/js/src/configure.in b/js/src/configure.in index a240c9a99e1f..52e7391220ad 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1033,11 +1033,11 @@ MOZ_ANDROID_STLPORT dnl ======================================================== dnl Suppress Clang Argument Warnings dnl ======================================================== -if test -n "$CLANG_CC"; then +if test -n "${CLANG_CC}${CLANG_CL}"; then _WARNINGS_CFLAGS="-Qunused-arguments ${_WARNINGS_CFLAGS}" CPPFLAGS="-Qunused-arguments ${CPPFLAGS}" fi -if test -n "$CLANG_CXX"; then +if test -n "${CLANG_CXX}${CLANG_CL}"; then _WARNINGS_CXXFLAGS="-Qunused-arguments ${_WARNINGS_CXXFLAGS}" fi