Commit 1172f6536247c8f5a382e6f9062034b1e9bec631
1 parent
e99a22cc
Really enable -Werror
487fefdb.. did not actually enable -Werror despite the claims made by configure output. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Showing
1 changed file
with
14 additions
and
13 deletions
configure
@@ -513,8 +513,21 @@ if test "$debug" = "no" ; then | @@ -513,8 +513,21 @@ if test "$debug" = "no" ; then | ||
513 | fi | 513 | fi |
514 | CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" | 514 | CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" |
515 | LDFLAGS="$LDFLAGS -g" | 515 | LDFLAGS="$LDFLAGS -g" |
516 | + | ||
517 | +# Consult white-list to determine whether to enable werror | ||
518 | +# by default. Only enable by default for git builds | ||
519 | +if test -z "$werror" ; then | ||
520 | + z_version=`cut -f3 -d. $source_path/VERSION` | ||
521 | + if test "$z_version" = "50" -a \ | ||
522 | + "$linux" = "yes" ; then | ||
523 | + werror="yes" | ||
524 | + else | ||
525 | + werror="no" | ||
526 | + fi | ||
527 | +fi | ||
528 | + | ||
516 | if test "$werror" = "yes" ; then | 529 | if test "$werror" = "yes" ; then |
517 | -CFLAGS="$CFLAGS -Werror" | 530 | + CFLAGS="$CFLAGS -Werror" |
518 | fi | 531 | fi |
519 | 532 | ||
520 | if test "$solaris" = "no" ; then | 533 | if test "$solaris" = "no" ; then |
@@ -653,18 +666,6 @@ if test ! -x "$(which cgcc 2>/dev/null)"; then | @@ -653,18 +666,6 @@ if test ! -x "$(which cgcc 2>/dev/null)"; then | ||
653 | sparse="no" | 666 | sparse="no" |
654 | fi | 667 | fi |
655 | 668 | ||
656 | -# Consult white-list to determine whether to enable werror | ||
657 | -# by default. Only enable by default for git builds | ||
658 | -if test -z "$werror" ; then | ||
659 | - z_version=`cut -f3 -d. $source_path/VERSION` | ||
660 | - if test "$z_version" = "50" -a \ | ||
661 | - "$linux" = "yes" ; then | ||
662 | - werror="yes" | ||
663 | - else | ||
664 | - werror="no" | ||
665 | - fi | ||
666 | -fi | ||
667 | - | ||
668 | # | 669 | # |
669 | # Solaris specific configure tool chain decisions | 670 | # Solaris specific configure tool chain decisions |
670 | # | 671 | # |