Skip to content

Commit eadf502

Browse files
committed
Use XORG_STRICT_OPTION from util-macros 1.14 to set -Werror flags
Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]>
1 parent 9275b1f commit eadf502

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

m4/xorg-tls.m4

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dnl
2222
dnl Authors: Jeremy Huddleston <[email protected]>
2323

2424
AC_DEFUN([XORG_TLS], [
25+
AC_REQUIRE([XORG_STRICT_OPTION])
2526
AC_MSG_CHECKING(for thread local storage (TLS) support)
2627
AC_CACHE_VAL(ac_cv_tls, [
2728
ac_cv_tls=none
@@ -36,10 +37,7 @@ AC_DEFUN([XORG_TLS], [
3637
AC_MSG_CHECKING(for tls_model attribute support)
3738
AC_CACHE_VAL(ac_cv_tls_model, [
3839
save_CFLAGS="$CFLAGS"
39-
dnl -Werror causes clang's default -Wunknown-attributes to become an error
40-
dnl We can't use -Werror=unknown-attributes because gcc doesn't understand it
41-
dnl -Werror=attributes is for gcc, clang seems to ignore it
42-
CFLAGS="$CFLAGS -Werror -Werror=attributes"
40+
CFLAGS="$CFLAGS $STRICT_CFLAGS"
4341
AC_TRY_COMPILE([int $ac_cv_tls __attribute__((tls_model("initial-exec"))) test;], [],
4442
ac_cv_tls_model=yes, ac_cv_tls_model=no)
4543
CFLAGS="$save_CFLAGS"

0 commit comments

Comments
 (0)