diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-11 15:52:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-11 15:52:36 -0400 |
| commit | e6dbe693b7fd90a495b98ec790205ff4ac56fea9 (patch) | |
| tree | 860b1efc42b04830bed8ba221c8598b1b73050bc | |
| parent | e36cd016337f26188f572e0bd511a4f8b72c07dc (diff) | |
| download | tor-e6dbe693b7fd90a495b98ec790205ff4ac56fea9.tar.gz tor-e6dbe693b7fd90a495b98ec790205ff4ac56fea9.zip | |
Make the option-checker code work with osx clang
This is a matter of making gcc and friends squirm more loudly when
they get an option they don't like (-pedantic) and making clang shut
up with it gets an option it tolerates but doesnt know
(-Qunknown-argument).
Is there no better way?
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index c482e37546..c5037fa35d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -46,7 +46,7 @@ AC_DEFUN([TOR_CHECK_CFLAGS], [ AS_VAR_PUSHDEF([VAR],[tor_cv_cflags_$1]) AC_CACHE_CHECK([whether the compiler accepts $1], VAR, [ tor_saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" + CFLAGS="$CFLAGS -pedantic $1" AC_TRY_COMPILE([], [return 0;], [AS_VAR_SET(VAR,yes)], [AS_VAR_SET(VAR,no)]) @@ -63,7 +63,7 @@ AC_DEFUN([TOR_CHECK_LDFLAGS], [ AS_VAR_PUSHDEF([VAR],[tor_cv_ldflags_$1]) AC_CACHE_CHECK([whether the linker accepts $1], VAR, [ tor_saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $1" + LDFLAGS="$LDFLAGS -pedantic $1" AC_TRY_LINK([], [return 0;], [AS_VAR_SET(VAR,yes)], [AS_VAR_SET(VAR,no)]) diff --git a/configure.in b/configure.in index d894c73df8..3e645753ee 100644 --- a/configure.in +++ b/configure.in @@ -173,6 +173,7 @@ AM_PROG_CC_C_O if test x$enable_gcc_hardening != xno; then CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + TOR_CHECK_CFLAGS(-Qunused-arguments) TOR_CHECK_CFLAGS(-fstack-protector-all) TOR_CHECK_CFLAGS(-Wstack-protector) TOR_CHECK_CFLAGS(-fwrapv) |