thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

build-sys: add -Werror to UL_WARN_ADD test

Browse source 
... so revert previous patches with extra options for clang.

Sometimes is simple solution so obvious that it's invisible :-)

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-07-16 17:42:09 +02:00
parent bec5c9db87
commit 4e80697552
2 changed files with 7 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -98,8 +98,6 @@ AC_C_CONST
AC_C_VOLATILE
AC_C_BIGENDIAN
UL_PROG_CLANG
dnl Compiler warnings
UL_WARN_ADD([-Wextra])
UL_WARN_ADD([-Wno-missing-field-initializers])
@ -112,9 +110,9 @@ UL_WARN_ADD([-fno-common])
UL_WARN_ADD([-Wunused-result])
UL_WARN_ADD([-Wmissing-prototypes])
UL_WARN_ADD([-Wunused-variable])
UL_WARN_ADD([-Wmissing-parameter-type], [clang])
UL_WARN_ADD([-Wunused-but-set-parameter], [clang])
UL_WARN_ADD([-Wunused-but-set-variable], [clang])
UL_WARN_ADD([-Wmissing-parameter-type])
UL_WARN_ADD([-Wunused-but-set-parameter])
UL_WARN_ADD([-Wunused-but-set-variable])
UL_WARN_ADD([-Wredundant-decls])
AC_SUBST([WARN_CFLAGS])

59
m4/compiler.m4
View file

@ -14,14 +14,14 @@ m4_ifdef([AS_VAR_APPEND],
[m4_define([UL_AS_VAR_APPEND],
[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])])
#
# UL_ADD_WARN([parameter])
# ------------------------
# Adds parameter to WARN_CFLAGS if the compiler supports it.
#
AC_DEFUN([UL_ADD_WARN_CFLAG], [
AC_DEFUN([UL_WARN_ADD], [
AS_VAR_PUSHDEF([ul_Warn], [ul_cv_warn_$1])dnl
AC_CACHE_CHECK([whether compiler handles $1], m4_defn([ul_Warn]), [
ul_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="${CPPFLAGS} $1"
CPPFLAGS="-Werror ${CPPFLAGS} $1"
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])],
[AS_VAR_SET(ul_Warn, [yes])],
[AS_VAR_SET(ul_Warn, [no])])
@ -30,54 +30,3 @@ AC_DEFUN([UL_ADD_WARN_CFLAG], [
AS_VAR_IF(ul_Warn, [yes], [UL_AS_VAR_APPEND([WARN_CFLAGS], [" $1"])])
])
# UL_WARN_ADD(PARAMETER, [EXCLUDE_CC_LIST])
# -----------------------------------------
# Adds parameter to WARN_CFLAGS if the compiler supports it. Ignore the
# parameter if compiler is in exclude list.
AC_DEFUN([UL_WARN_ADD], [
m4_ifval([$2], [
warn_exclude="$2"
case $compiler_clang in
yes) warn_cc=clang ;;
*) warn_cc=$CC ;;
esac
case ${warn_exclude} in
*${warn_cc}*)
AC_MSG_CHECKING([whether compiler handles $1])
AC_MSG_RESULT([excluded])
;;
*)
UL_ADD_WARN_CFLAG([$1])
;;
esac],
[UL_ADD_WARN_CFLAG([$1])])
])
# UL_PROG_CLANG
# -------------
# Checks if compiler is clang, defines compiler_clang=yes if yes.
#
# Note that generic CC variable is not modified by this function. It's
# possible that CC is set to 'cc' and the file /usr/bin/cc is a symlink to
# /usr/bin/clang, then compiler_clang is also set ot 'yes'.
AC_DEFUN([UL_PROG_CLANG], [
AC_REQUIRE([AC_PROG_CC])
AC_CACHE_CHECK([whether clang is in use], [ul_cv_clang], [
case ${CC} in #(
*gcc*) ul_cv_clang=no ;;
*clang*) ul_cv_clang=yes ;;
*) AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() {
#ifdef __clang__
return 0;
#else
#error The __clang__ was not defined
#endif
}])],
[ul_cv_clang=yes],
[ul_cv_clang=no]
) ;;
esac
])
compiler_clang=$ul_cv_clang
])