nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sebastian/clang-3.0-fixes_master'

Browse Source
This commit is contained in:
Nick Mathewson 2011-12-16 17:48:25 -05:00
commit 9df0bf7a40
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/clang_30_options Normal file
View File

@ -0,0 +1,5 @@
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.

10
configure.in
View File

@ -1170,10 +1170,10 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
#error #error
#endif])], have_gcc43=yes, have_gcc43=no) #endif])], have_gcc43=yes, have_gcc43=no)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9) #if !defined(__clang__)
#error #error
#endif])], have_clang29orlower=yes, have_clang29orlower=no) #endif])], have_clang=yes, have_clang=no)
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wshorten-64-to-32" 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. # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3.
fi 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 # 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" CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init"
fi fi