summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-05-02 19:48:42 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-05-27 19:51:05 -0700
commiteadf5021794782fde861d471ed408675f4926b89 (patch)
tree96ea0d4bfc5502521978dcc45a8014f9d942de24
parent9275b1fb6f82a6971c4177ddd3d5a859a8f24119 (diff)
Use XORG_STRICT_OPTION from util-macros 1.14 to set -Werror flags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--m4/xorg-tls.m46
1 files 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 <jeremyhu@apple.com>
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"