Commit cefff119 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2

parents 562c974e bcca541d

changes/clang_30_options

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Code simplifications and refactoring:

    - During configure, detect when we're building with clang version 3.0 or

      lower and disable the -Wnormalized=id and -Woverride-init CFLAGS.

      clang doesn't support them yet.

configure.in

+4 −6
Original line number Diff line number Diff line
@@ -941,9 +941,9 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy 
#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)

#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"
@@ -980,10 +980,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