diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-26 14:32:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-26 14:32:22 -0400 |
| commit | c66138609a489bb8aa312ead04aebd1bc65e679c (patch) | |
| tree | 381d58471d98138781121144ef4fbf58376b842c | |
| parent | 2804c6b7fff6da6eb337117f01847eadab7701c0 (diff) | |
| parent | 30b766ba129c5eaefacd70fe29b482fb63ebfffe (diff) | |
| download | tor-c66138609a489bb8aa312ead04aebd1bc65e679c.tar.gz tor-c66138609a489bb8aa312ead04aebd1bc65e679c.zip | |
Merge remote branch 'origin/maint-0.2.1'
| -rw-r--r-- | changes/openbsd-sysheaders | 4 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/changes/openbsd-sysheaders b/changes/openbsd-sysheaders new file mode 100644 index 0000000000..2babde2d78 --- /dev/null +++ b/changes/openbsd-sysheaders @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When building with --enable-gcc-warnings on OpenBSD, disable + warnings in system headers. This makes --enable-gcc-warnings + pass on OpenBSD 4.8.
\ No newline at end of file diff --git a/configure.in b/configure.in index 917be20ed8..cb07b2f7b0 100644 --- a/configure.in +++ b/configure.in @@ -869,6 +869,15 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy have_shorten64_flag=no) CFLAGS="$save_CFLAGS" + case $host in + *-*-openbsd*) + # Some OpenBSD versions (like 4.8) have -Wsystem-headers by default. + # That's fine, except that the headers don't pass -Wredundant-decls. + # Therefore, let's disable -Wsystem-headers when we're building + # with maximal warnings on OpenBSD. + CFLAGS="$CFLAGS -Wno-system-headers" ;; + esac + CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum" if test x$enable_gcc_warnings = xyes; then CFLAGS="$CFLAGS -Werror" @@ -876,7 +885,7 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy # Disabled, so we can use mallinfo(): -Waggregate-return - if test x$have_gcc4 = xyes ; then + if test x$have_gcc4 = xyes ; then # These warnings break gcc 3.3.5 and work on gcc 4.0.2 CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition" fi |