From eadf5021794782fde861d471ed408675f4926b89 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 2 May 2011 19:48:42 -0700 Subject: [PATCH] Use XORG_STRICT_OPTION from util-macros 1.14 to set -Werror flags Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston --- m4/xorg-tls.m4 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/m4/xorg-tls.m4 b/m4/xorg-tls.m4 index 563850420..237fdcd9e 100644 --- a/m4/xorg-tls.m4 +++ b/m4/xorg-tls.m4 @@ -22,6 +22,7 @@ dnl dnl Authors: Jeremy Huddleston AC_DEFUN([XORG_TLS], [ + AC_REQUIRE([XORG_STRICT_OPTION]) AC_MSG_CHECKING(for thread local storage (TLS) support) AC_CACHE_VAL(ac_cv_tls, [ ac_cv_tls=none @@ -36,10 +37,7 @@ AC_DEFUN([XORG_TLS], [ AC_MSG_CHECKING(for tls_model attribute support) AC_CACHE_VAL(ac_cv_tls_model, [ save_CFLAGS="$CFLAGS" - dnl -Werror causes clang's default -Wunknown-attributes to become an error - dnl We can't use -Werror=unknown-attributes because gcc doesn't understand it - dnl -Werror=attributes is for gcc, clang seems to ignore it - CFLAGS="$CFLAGS -Werror -Werror=attributes" + CFLAGS="$CFLAGS $STRICT_CFLAGS" AC_TRY_COMPILE([int $ac_cv_tls __attribute__((tls_model("initial-exec"))) test;], [], ac_cv_tls_model=yes, ac_cv_tls_model=no) CFLAGS="$save_CFLAGS"