diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-16 17:48:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-16 17:48:25 -0500 |
| commit | 9df0bf7a40eab077a5959eb9df6b1db79c729dde (patch) | |
| tree | 63e2ced7d4efe0de8e633b7f6746fccdcccd6408 /configure.in | |
| parent | 3ee5924d1812598c1671d4f3b2a5804fcf83c848 (diff) | |
| parent | bcca541da9f60d95fe7f0f7b3aa6ef4a8251b1e2 (diff) | |
| download | tor-9df0bf7a40eab077a5959eb9df6b1db79c729dde.tar.gz tor-9df0bf7a40eab077a5959eb9df6b1db79c729dde.zip | |
Merge remote-tracking branch 'sebastian/clang-3.0-fixes_master'
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 8f70f229d9..b05e935343 100644 --- a/configure.in +++ b/configure.in @@ -1170,10 +1170,10 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy #error #endif])], have_gcc43=yes, have_gcc43=no) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ -#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +#if !defined(__clang__) #error -#endif])], have_clang29orlower=yes, have_clang29orlower=no) +#endif])], have_clang=yes, have_clang=no) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" @@ -1215,10 +1215,8 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi - if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then + if test x$have_gcc42 = xyes && test x$have_clang = xno; then # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2 - # We only disable these for clang 2.9 and lower, in case they are - # supported in later versions. CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init" fi |