[PATCH 2/2] Use XORG_STRICT_OPTION from util-macros 1.14 to set -Werror flags

[Jeremy Huddleston]

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

Thanks.

On May 2, 2011, at 8:54 PM, Alan Coopersmith wrote:

> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
> 
> Assumes PATCH 1/2 has already established the baseline of macros 1.14 in
> configure.ac (though it mostly works fine without it, just allows unknown
> attribute warnings to appear on compilers that don't support them but don't
> make them fatal errors).
> 
> m4/xorg-tls.m4 |    6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/m4/xorg-tls.m4 b/m4/xorg-tls.m4
> index 5638504..237fdcd 100644
> --- a/m4/xorg-tls.m4
> +++ b/m4/xorg-tls.m4
> @@ -22,6 +22,7 @@ dnl
> dnl Authors: Jeremy Huddleston <jeremyhu at 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"
> -- 
> 1.7.3.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>