From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 25 Jan 2019 11:24:41 +0100 Subject: New upstream version 1.15.2 --- m4/compiler_options.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'm4/compiler_options.m4') diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4 index 0683e44e..1f283db6 100644 --- a/m4/compiler_options.m4 +++ b/m4/compiler_options.m4 @@ -31,7 +31,7 @@ AC_DEFUN([NM_COMPILER_FLAG], [ dnl Check whether a particular warning is not emitted with code provided, dnl append an option to disable the warning to a specified variable if the check fails. -dnl NM_COMPILER_WARNING([ENV-VAR], [C-SNIPPET], [WARNING]]) +dnl NM_COMPILER_WARNING([ENV-VAR], [WARNING], [C-SNIPPET]) AC_DEFUN([NM_COMPILER_WARNING], [ _NM_COMPILER_FLAG([-W$2], [$3], [eval "AS_TR_SH([$1])='$$1 -W$2'"], [eval "AS_TR_SH([$1])='$$1 -Wno-$2'"]) ]) @@ -47,10 +47,10 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then dnl This is enabled in clang by default, makes little sense, dnl and causes the build to abort with -Werror. - CFLAGS_SAVED="$$1" - eval "AS_TR_SH([$1])='$$1 -Qunused-arguments'" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [], eval "AS_TR_SH([$1])='$CFLAGS_SAVED'") - unset CFLAGS_SAVED + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS -Qunused-arguments" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], eval "AS_TR_SH([$1])='$$1 -Qunused-arguments'", []) + CFLAGS="$CFLAGS_SAVED" dnl clang only warns about unknown warnings, unless dnl called with "-Werror=unknown-warning-option" -- cgit 1.3.0-6-gf8a5